[X2Go-Commits] [pyhoca-gui] 04/08: pyhoca-gui.spec: adapt Requires 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 ee325f8c9bea36808cd03c957fb5f384256378ab
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 21 04:16:33 2019 +0100

    pyhoca-gui.spec: adapt Requires to Python 2/3 logic.
---
 debian/changelog |  1 +
 pyhoca-gui.spec  | 45 ++++++++++++++++++++++-----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e940153..2d7f1f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ pyhoca-gui (0.6.1.0-0x2go1) UNRELEASED; urgency=medium
   * pyhoca-gui.spec:
     + Copy Python 2/3 helpers from PyHoca CLI.
     + Adapt Build-Requires to Python 2/3 logic.
+    + Adapt Requires 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 8f56451..ba9d21d 100644
--- a/pyhoca-gui.spec
+++ b/pyhoca-gui.spec
@@ -132,43 +132,42 @@ BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 %endif
 
+%if 0%{?with_python2}
 Requires:       python-argparse
-Requires:       python-cups
-Requires:       python-setproctitle
-Requires:       python-x2go >= 0.6.1.2
+%if ( ! 0%{?rhel} ) || 0%{?rhel} >= 7
+Requires:       %{name_helper_python2}-cups
+%endif
+%if 0%{?rhel} && 0%{?rhel} < 7
+Requires:       system-config-printer-libs
+%endif
+Requires:       %{name_helper_python2}-setproctitle
+Requires:       %{name_helper_python2}-x2go >= 0.6.1.2
+%if 0%{?suse_version}
 %if 0%{?suse_version} >= 1230
-Requires:       python-gobject
-Requires:       python-wxWidgets-2_9
+Requires:       %{name_helper_python2}-gobject
+Requires:       %{name_helper_python2}-wxWidgets-2_9
 Requires:       typelib-1_0-Notify-0_7
 %else
 Requires:       python-notify
 Requires:       wxPython
 %endif
 %else
-%if 0%{?fedora} || 0%{?rhel} >= 8
-Requires:       python%{python3_pkgversion}-cups
-Requires:       python%{python3_pkgversion}-setproctitle
-Requires:       python%{python3_pkgversion}-x2go >= 0.6.1.2
-Requires:       libnotify
-Requires:       python%{python3_pkgversion}-gobject-base
-Requires:       python%{python3_pkgversion}-wxPython4
-%else
-%if 0%{?rhel} && 0%{?rhel} < 7
-Requires:       system-config-printer-libs
-Requires:       python-argparse
-%else
-Requires:       python2-cups
-%endif
-Requires:       python2-setproctitle
-Requires:       python2-x2go >= 0.6.1.2
 %if 0%{?fedora} >= 22
 Requires:       libnotify
-Requires:       python2-gobject-base
+Requires:       %{name_helper_python2}-gobject-base
 %else
 Requires:       notify-python
 %endif
-Requires:       python2-wxpython
+Requires:       %{name_helper_python2}-wxpython
 %endif
+%if 0%{?with_python3}
+# FIXME: this is pretty RHEL-centric, will need to be adapted for Python-3-support!
+Requires:       %{name_helper_python3}-cups
+Requires:       %{name_helper_python3}-setproctitle
+Requires:       %{name_helper_python3}-x2go >= 0.6.1.2
+Requires:       libnotify
+Requires:       %{name_helper_python3}-gobject-base
+Requires:       %{name_helper_python3}-wxPython4
 %endif
 
 %description

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