[X2Go-Commits] [pyhoca-gui] 03/08: pyhoca-gui.spec: adapt Build-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 3c1d03ad32e0ed227f1a16bacddc59e4e312a249
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 21 04:13:44 2019 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 9d825fd..e940153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ pyhoca-gui (0.6.1.0-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.6.1.0):
   * pyhoca-gui.spec:
     + Copy Python 2/3 helpers from PyHoca CLI.
+    + Adapt Build-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 aa7bb5a..8f56451 100644
--- a/pyhoca-gui.spec
+++ b/pyhoca-gui.spec
@@ -107,29 +107,31 @@ URL:            https://www.x2go.org/
 Source0:        https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
-%if 0%{?suse_version}
+%if 0%{?with_python2}
+%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) )
+# On some *SuSE versions, we still need python-devel, even though we also enable Python 3
+# builds there and consequently should build-depend upon python2-devel... but it doesn't
+# exist there.
 BuildRequires:  python-devel
-BuildRequires:  fdupes
-BuildRequires:  python-setuptools
-BuildRequires:  python-distutils-extra
-%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 )
-BuildRequires:  python-rpm-macros
-%endif
 %else
-%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-distutils-extra
-%else
-BuildRequires:  python2-devel
+BuildRequires:  %{name_helper_python2}-devel
+%endif
 BuildRequires:  python-setuptools
 BuildRequires:  python-distutils-extra
 %endif
+%if 0%{?with_python3}
+BuildRequires:  %{name_helper_python3}-devel
+BuildRequires:  %{name_helper_python3}-setuptools
+BuildRequires:  %{name_helper_python3}-distutils-extra
 %endif
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
-
 %if 0%{?suse_version}
+BuildRequires:  fdupes
+%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 )
+BuildRequires:  python-rpm-macros
+%endif
+
 Requires:       python-argparse
 Requires:       python-cups
 Requires:       python-setproctitle

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