[X2Go-Commits] [python-x2go] 01/05: python-x2go.spec: rework python_module compat section.

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 29cc9b6b04b9ac1f09c6b6e18c490f3948d4a72c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Dec 18 07:42:11 2019 +0100

    python-x2go.spec: rework python_module compat section.
    
    Be generic.
    
    Add support for EPEL 7+ packages via %{python3_pkgversion}, hardcode
    EPEL 6 packages to python34 and leave everything else mostly untouched.
---
 debian/changelog |  7 +++++++
 python-x2go.spec | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dcc8d32..2dc6b26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,13 @@ python-x2go (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
     - Fix writing of inifiles when running under Python3.
     - x2go/inifiles.py: No need to import future's print_function() anymore.
 
+  [ Mihai Moldovan ]
+  * New upstream version (0.6.1.2):
+  * python-x2go.spec:
+    + Rework python_module compat section. Be generic. Add support for EPEL 7+
+      packages via %{python3_pkgversion}, hardcode EPEL 6 packages to python34
+      and leave everything else mostly untouched.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Fri, 22 Nov 2019 08:19:40 +0100
 
 python-x2go (0.6.1.1-0x2go1) unstable; urgency=medium
diff --git a/python-x2go.spec b/python-x2go.spec
index 437b340..f58393d 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -16,13 +16,29 @@
 %endif
 
 # Provide a default implementation, essentially for non-*SuSE platforms.
-%if 0%{?with_python3} && ( ! ( 0%{?rhel} ) || 0%{?rhel} > 7 )
+%if 0%{?with_python3}
+%if ( ! ( 0%{?rhel} )
 %if 0%{?with_python2}
 %{?!python_module:%global python_module() python-%{**} python3-%{**}}
 %else
 %{?!python_module:%global python_module() python3-%{**}}
 %endif
 %else
+%if 0%{?rhel} >= 7
+%if 0%{?with_python2}
+%{?!python_module:%global python_module() python-%{**} python%{python3_pkgversion}-%{**}}
+%else
+%{?!python_module:%global python_module() python%{python3_pkgversion}-%{**}}
+%endif
+%else
+%if 0%{?with_python2}
+%{?!python_module:%global python_module() python-%{**} python34-%{**}}
+%else
+%{?!python_module:%global python_module() python34-%{**}}
+%endif
+%endif
+%endif
+%else
 %if 0%{?with_python2}
 %{?!python_module:%global python_module() python-%{**}}
 %else

--
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