[X2Go-Commits] [pyhoca-gui] 07/08: pyhoca-gui.spec: adapt %install 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 9baf203a3fe4796f478a112e497e0d92242c7485
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 21 04:21:01 2019 +0100

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

diff --git a/debian/changelog b/debian/changelog
index f50460d..418f5aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ pyhoca-gui (0.6.1.0-0x2go1) UNRELEASED; urgency=medium
     + Adapt Requires to Python 2/3 logic.
     + Replace hashbang in %prep.
     + Adapt %build to Python 2/3 logic.
+    + Adapt %install 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 21c7582..2ae53ec 100644
--- a/pyhoca-gui.spec
+++ b/pyhoca-gui.spec
@@ -224,19 +224,28 @@ python3 setup.py build
 %endif
 
 %install
+%if 0%{?with_python2}
 %if 0%{?suse_version}
 %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) )
-python2 setup.py install -O1 --skip-build --prefix %{_prefix} --root %{buildroot}
+python2 setup.py install --skip-build --root %{buildroot}
 %else
-%{python2_install} -O1
+%{python2_install} --skip-build
 %endif
 %else
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%{py3_install}
-%else
 %{py2_install}
 %endif
 %endif
+%if 0%{?with_python3}
+%if 0%{?suse_version}
+%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) )
+python3 setup.py install -O1 --skip-build --prefix %{_prefix} --root %{buildroot}
+%else
+%{python3_install} -O1 --skip-build
+%endif
+%else
+%{py3_install}
+%endif
+%endif
 mkdir -p %{buildroot}%{_bindir}/
 cp -p %{name} %{buildroot}%{_bindir}/
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop

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