[X2Go-Commits] [pyhoca-cli] 01/01: pyhoca-cli.spec: include python2_sitelib for CentOS, python3_sitelib otherwise.

git-admin at x2go.org git-admin at x2go.org
Sat Nov 10 14:30:49 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pyhoca-cli.

commit 4b69e6117d11f2cd36fe5d4dfbfeed67e7d459d3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 10 14:30:35 2018 +0100

    pyhoca-cli.spec: include python2_sitelib for CentOS, python3_sitelib otherwise.
    
    Comment out for now to let builds fail and get a file list.
---
 debian/changelog |  2 ++
 pyhoca-cli.spec  | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8a7998d..80f5d75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
     - Either EL6 or EL7, not both at the same time.
     - Use modern python build and install macros.
     - Build-Require python-rpm-macros for OpenSuSE builds.
+    - Include python2_sitelib for CentOS, python3_sitelib otherwise. Comment
+      out for now to let builds fail and get a file list.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 19 Sep 2018 15:20:43 +0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 050dedf..57d08cb 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -95,7 +95,16 @@ cp -rp man/* %{buildroot}/%{_mandir}/
 %defattr(-,root,root)
 %doc COPYING README TODO
 %{_bindir}/%{name}
-%{python3_sitelib}/*
+%if 0%{?el6} || 0%{?el7}
+#%%{python2_sitelib}/
+%else
+#%%{python3_sitelib}/*
+%if 0%{?suse_version}
+%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 )
+%pycache_only %{python3_sitelib}/__pycache__
+%endif
+%endif
+%endif
 %{_mandir}/man1/%{name}.1*
 
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git


More information about the x2go-commits mailing list