[X2Go-Commits] [python-x2go] 01/01: python-x2go.spec: local %defines are buggy in older RPM implementations, work around by using %global instead.

git-admin at x2go.org git-admin at x2go.org
Sat Jun 2 02:18:00 CEST 2018


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

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

commit 71bff060071d6cfac8abab55077afa5a23f4fc4f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 2 02:09:11 2018 +0200

    python-x2go.spec: local %defines are buggy in older RPM implementations, work around by using %global instead.
---
 debian/changelog | 2 ++
 python-x2go.spec | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ccc915..9b97b56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ python-x2go (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
     - Actually disable python3 builds on OpenSuSE.
     - OpenSuSE Leap 15 and TumbleWeed renamed python-xlib to
       python{2,3}-python-xlib.
+    - Local %defines are buggy in older RPM implementations, work around by
+      using %global instead.
 
  -- 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 a019051..003a07a 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -2,13 +2,13 @@
 %bcond_with     python3
 
 %if 0%{?with_python3} && ( ! ( 0%{?rhel} ) || 0%{?rhel} > 7 )
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%{?!python_module:%global python_module() python-%{**} python3-%{**}}
 %else
-%{?!python_module:%define python_module() python-%{**}}
+%{?!python_module:%global python_module() python-%{**}}
 %endif
 
 %if ! 0%{?with_python3}
-%define         skip_python3 1
+%global         skip_python3 1
 %endif
 
 Name:           python-x2go

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