[X2Go-Commits] [x2goclient] 09/25: pyhoca-cli.spec: also fix install phase for Python 2 variant on older *SuSE variants.

[git-admin at x2go.org]

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

x2go pushed a commit to annotated tag 0.6.1.2
in repository x2goclient.

commit 1353f72144948471f5fb043096ceff5aaa4c3411
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Dec 18 22:50:38 2019 +0100

    pyhoca-cli.spec: also fix install phase for Python 2 variant on older *SuSE variants.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fbd7de7f..0f44bead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
     + Fix syntax error.
     + Actually change the hashbang of a file...
     + Fix building Python 2 variant on older *SuSE variants.
+    + Also fix install phase for Python 2 variant on older *SuSE variants.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Fri, 22 Nov 2019 15:26:45 +0100
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 79f726b4..0e170ab7 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -186,8 +186,16 @@ python3 setup.py build
 
 %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 --skip-build --root %{buildroot}
+%else
+%{python2_install} --skip-build
+%endif
+%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} ) )

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