[X2Go-Commits] [pyhoca-gui] 01/02: pyhoca-gui.spec: use %{__python2*} instead of %{__python*} on FC29+.

[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 b517a63e901dadf9ad5b36f3edb431b4d67498fc
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 9 14:28:00 2018 +0100

    pyhoca-gui.spec: use %{__python2*} instead of %{__python*} on FC29+.
---
 debian/changelog |  5 +++++
 pyhoca-gui.spec  | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4e3e83a..c821b05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ pyhoca-gui (0.5.0.8-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.5.0.8):
     - po/fi.po: update Finnish translation file.
 
+  [ Mihai Moldovan ]
+  * New upstream version (0.5.0.8):
+  * pyhoca-gui.spec:
+    - Use %{__python2*} instead of %{__python*} on FC29+.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Sun, 24 Sep 2017 11:28:17 +0200
 
 pyhoca-gui (0.5.0.7-0x2go1) unstable; urgency=medium
diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec
index 1880745..479ab24 100644
--- a/pyhoca-gui.spec
+++ b/pyhoca-gui.spec
@@ -67,12 +67,21 @@ notification area and allows multiple X2Go session handling.
 
 
 %build
+%if 0%{?fedora} >= 29
+%{__python2} setup.py build_i18n
+%{__python2} setup.py build
+%else
 %{__python} setup.py build_i18n
 %{__python} setup.py build
+%endif
 
 
 %install
+%if 0%{?fedora} >= 29
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+%else
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%endif
 mkdir -p %{buildroot}%{_bindir}/
 cp -p %{name} %{buildroot}%{_bindir}/
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -98,7 +107,11 @@ fi
 %defattr(-,root,root)
 %doc COPYING README TODO
 %{_bindir}/%{name}
+%if 0%{?fedora} >= 29
+%{python2_sitelib}/*
+%else
 %{python_sitelib}/*
+%endif
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/PyHoca/
 %{_datadir}/pixmaps/pyhoca_x2go-logo-ubuntu.svg

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