[X2Go-Commits] [pyhoca-gui] 08/08: pyhoca-gui.spec: adapt %files to Python 2/3 logic.

[git-admin at x2go.org]

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

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

commit 1f3f74ddc64735e6b2d684d0660dbdf44b2213ac
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 21 04:21:33 2019 +0100

    pyhoca-gui.spec: adapt %files to Python 2/3 logic.
---
 debian/changelog |  1 +
 pyhoca-gui.spec  | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 418f5aa..22f3900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ pyhoca-gui (0.6.1.0-0x2go1) UNRELEASED; urgency=medium
     + Replace hashbang in %prep.
     + Adapt %build to Python 2/3 logic.
     + Adapt %install to Python 2/3 logic.
+    + Adapt %files to Python 2/3 logic.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 11 Dec 2019 12:47:21 +0100
 
diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec
index 2ae53ec..dfea9bc 100644
--- a/pyhoca-gui.spec
+++ b/pyhoca-gui.spec
@@ -271,22 +271,29 @@ fi
 %defattr(-,root,root)
 %doc COPYING README TODO
 %{_bindir}/%{name}
+
+%if 0%{?with_python2}
 %if 0%{?suse_version}
 %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 )
-%{python2_sitelib}/PyHoca_GUI*
 %{python2_sitelib}/pyhoca/
+%{python2_sitelib}/PyHoca_GUI*
 %pycache_only %{python2_sitelib}/__pycache__
 %else
-%{python_sitelib}/PyHoca_GUI*
 %{python_sitelib}/pyhoca/
+%{python_sitelib}/PyHoca_GUI*
 %endif
 %else
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%{python3_sitelib}/PyHoca_GUI*
-%{python3_sitelib}/pyhoca/
-%else
-%{python2_sitelib}/PyHoca_GUI*
 %{python2_sitelib}/pyhoca/
+%{python2_sitelib}/PyHoca_GUI*
+%endif
+%endif
+%if 0%{?with_python3}
+%{python3_sitelib}/pyhoca/
+%{python3_sitelib}/PyHoca_GUI*
+%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
 %{_datadir}/applications/%{name}.desktop

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