This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository python-x2go.
commit 039135b1590b43f9ad125f1d1cee88e44dbf9b2e
Author: Mihai Moldovan <io...@ionic.de>
Date: Wed Dec 18 07:49:57 2019 +0100
python-x2go.spec: same thing as name_helper_python2 for Python 2 names.
---
debian/changelog | 1 +
python-x2go.spec | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ad77b25..da47a2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ python-x2go (0.6.1.2-0x2go1) UNRELEASED; urgency=medium
and leave everything else mostly untouched.
+ Add name_helper_python3 macro, simplifying Python 3 package name usage a
lot.
+ + Same thing as name_helper_python2 for Python 2 names.
-- X2Go Release Manager <git-ad...@x2go.org> Fri, 22 Nov 2019 08:19:40 +0100
diff --git a/python-x2go.spec b/python-x2go.spec
index 83754e0..7a61b5a 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -20,23 +20,29 @@
%if ( ! ( 0%{?rhel} )
%global name_helper_python3 python3
%if 0%{?with_python2}
+%global name_helper_python2 python2
%{?!python_module:%global python_module() python-%{**} python3-%{**}}
%else
+%global name_helper_python2
%{?!python_module:%global python_module() python3-%{**}}
%endif
%else
%if 0%{?rhel} >= 7
%global name_helper_python3 python%{python3_pkgversion}
%if 0%{?with_python2}
+%global name_helper_python2 python2
%{?!python_module:%global python_module() python-%{**}
python%{python3_pkgversion}-%{**}}
%else
+%global name_helper_python2
%{?!python_module:%global python_module() python%{python3_pkgversion}-%{**}}
%endif
%else
%global name_helper_python3 python34
%if 0%{?with_python2}
+%global name_helper_python2 python
%{?!python_module:%global python_module() python-%{**} python34-%{**}}
%else
+%global name_helper_python2
%{?!python_module:%global python_module() python34-%{**}}
%endif
%endif
@@ -44,8 +50,10 @@
%else
%global name_helper_python3
%if 0%{?with_python2}
+%global name_helper_python2 python
%{?!python_module:%global python_module() python-%{**}}
%else
+%global name_helper_python2
%{?!python_module:%global python_module()}
%endif
%endif
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/python-x2go.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
