[X2Go-Commits] [python-x2go] 02/02: python-x2go.spec: override python_module macro for OpenSuSE Leap 42.3, the shipped version does not what later versions do correctly.

[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 python-x2go.

commit b7549f54a4ae5d30fc20afe53502de745bed1292
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 2 06:38:50 2018 +0200

    python-x2go.spec: override python_module macro for OpenSuSE Leap 42.3, the shipped version does not what later versions do correctly.
---
 debian/changelog |  2 ++
 python-x2go.spec | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d57bf0b..886cd98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ python-x2go (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
     - Older OpenSuSE Leap versions don't support %{python2_sitelib} - use
       %{python_sitelib} instead.
     - Document %(python_module} definitions.
+    - Override python_module macro for OpenSuSE Leap 42.3, the shipped version
+      does not what later versions do correctly.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 22 Sep 2017 14:15:05 +0200
 
diff --git a/python-x2go.spec b/python-x2go.spec
index 9ef3ef1..eb2223b 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -12,6 +12,19 @@
 %global         skip_python3 1
 %endif
 
+# Workaround for OpenSuSE Leap 42.3. This is the first version to introduce
+# the macros, but in a broken state. It will generate pythonX dependencies
+# if pythonX has been installed in the build environment and not honor
+# skip_pythonX.
+# Override to the expected behavior.
+%if 0%{?sle_version} && 0%{?sle_version} == 120300 && 0%{?is_opensuse}
+%if 0%{?with_python3}
+%global python_module() python-%{**} python3-%{**}
+%else
+%global python_module() python-%{**}
+%endif
+%endif
+
 Name:           python-x2go
 Version:        0.5.99.1
 Release:        0.0x2go1%{?dist}

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