[X2Go-Commits] [pyhoca-gui] 01/01: pyhoca-gui.spec: use %{py(thon)2_build} instead of calling setup.py build manually if possible, otherwise build artifacts will be removed before calling %{py(thon)2_install} later on, which leads to a build failure on OpenSuSE platforms.
git-admin at x2go.org
git-admin at x2go.org
Sun Nov 11 11:23:21 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository pyhoca-gui.
commit f0f4c910f977e87470409edc7b197a14eea34cec
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun Nov 11 11:22:23 2018 +0100
pyhoca-gui.spec: use %{py(thon)2_build} instead of calling setup.py build manually if possible, otherwise build artifacts will be removed before calling %{py(thon)2_install} later on, which leads to a build failure on OpenSuSE platforms.
---
debian/changelog | 4 ++++
pyhoca-gui.spec | 12 +++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3e20036..eb91e4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ pyhoca-gui (0.5.0.8-0x2go1) UNRELEASED; urgency=medium
- Cherry-pick files in structure even more carefully.
- Test %build macro, because the second command seems to be skipped on
OpenSuSE (what?)
+ - Use %{py(thon)2_build} instead of calling setup.py build manually if
+ possible, otherwise build artifacts will be removed before calling
+ %{py(thon)2_install} later on, which leads to a build failure on
+ OpenSuSE platforms.
-- X2Go Release Manager <git-admin at x2go.org> Sun, 24 Sep 2017 11:28:17 +0200
diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec
index e3114c4..3be15c0 100644
--- a/pyhoca-gui.spec
+++ b/pyhoca-gui.spec
@@ -70,9 +70,15 @@ notification area and allows multiple X2Go session handling.
%build
-%{__python2} setup.py build_i18n
-echo foo
-%{__python2} setup.py build
+%if 0%{?suse_version}
+%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) )
+python2 setup.py build
+%else
+%{python2_build}
+%endif
+%else
+%{py2_build}
+%endif
%install
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
More information about the x2go-commits
mailing list