[X2Go-Commits] [python-x2go] 05/05: python-x2go.spec: same for %{name_helper_python2}.

git-admin at x2go.org git-admin at x2go.org
Wed Dec 18 08:22:13 CET 2019


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

x2go pushed a commit to branch master
in repository python-x2go.

commit b3782a1094e9e689a929d419616ee1431a7e9df1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Dec 18 08:21:43 2019 +0100

    python-x2go.spec: same for %{name_helper_python2}.
---
 debian/changelog |  1 +
 python-x2go.spec | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 621610b..e671322 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ python-x2go (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
       lot.
     + Same thing as name_helper_python2 for Python 2 names.
     + Switch to actually using %{name_helper_python3}.
+    + Same for %{name_helper_python2}.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Fri, 22 Nov 2019 08:19:40 +0100
 
diff --git a/python-x2go.spec b/python-x2go.spec
index 33a4f88..c75ba10 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -105,9 +105,12 @@ BuildArch:      noarch
 # OpenSuSE Leap or SLE and either OpenSuSE Leap 42.2 or lower               or        SLE
 %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
 %else
-BuildRequires:  python2-devel
+BuildRequires:  %{name_helper_python2}-devel
 %endif
 %endif
 %if 0%{?with_python3}
@@ -155,10 +158,7 @@ This Python module allows you to integrate X2Go client support into your
 Python applications by providing a Python-based X2Go client API.
 
 %if 0%{?with_python2}
-# Let's assume that RHEL/EPEL 8 finally introduce proper Python 3 support...
-%if ( ! 0%{?rhel} ) || 0%{?rhel} >= 8
-%package -n python2-x2go
-%endif
+%package -n %{name_helper_python2}-x2go
 Summary:        %{summary}
 Group:          Development/Languages
 Requires:       python-gevent
@@ -173,10 +173,9 @@ Requires:       python-simplejson
 Requires:       python-future
 Requires:       python-configparser
 Requires:       nxproxy
-%{?python_provide:%python_provide python2-x2go}
+%{?python_provide:%python_provide %{name_helper_python2}-x2go}
 
-%if ( ! 0%{?rhel} ) || 0%{?rhel} >= 8
-%description -n python2-x2go
+%description -n %{name_helper_python2}-x2go
 X2Go is a server based computing environment with:
    - session resuming
    - low bandwidth support
@@ -188,7 +187,6 @@ X2Go is a server based computing environment with:
 This Python module allows you to integrate X2Go client support into your
 Python applications by providing a Python-based X2Go client API.
 %endif
-%endif
 
 
 %if 0%{?with_python3}
@@ -304,11 +302,7 @@ python3 setup.py install --skip-build --root %{buildroot}
 %doc docs/build/html
 
 %if 0%{?with_python2}
-%if 0%{?rhel} && 0%{?rhel} < 8
-%files
-%else
-%files -n python2-x2go
-%endif
+%files -n %{name_helper_python2}-x2go
 %defattr(-,root,root)
 %license COPYING
 %doc README* TODO

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


More information about the x2go-commits mailing list