This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit ce77535b1d30fe2e65b8c0ff0caf0dac2b9fb1f9 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 18 07:49:07 2019 +0100 python-x2go.spec: add name_helper_python3 macro, simplifying Python 3 package name usage a lot. --- debian/changelog | 2 ++ python-x2go.spec | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2dc6b26..ad77b25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ python-x2go (0.6.1.2-0x2go1) UNRELEASED; urgency=medium + 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. + + Add name_helper_python3 macro, simplifying Python 3 package name usage a + lot. -- X2Go Release Manager <git-admin@x2go.org> Fri, 22 Nov 2019 08:19:40 +0100 diff --git a/python-x2go.spec b/python-x2go.spec index f58393d..83754e0 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -18,6 +18,7 @@ # Provide a default implementation, essentially for non-*SuSE platforms. %if 0%{?with_python3} %if ( ! ( 0%{?rhel} ) +%global name_helper_python3 python3 %if 0%{?with_python2} %{?!python_module:%global python_module() python-%{**} python3-%{**}} %else @@ -25,12 +26,14 @@ %endif %else %if 0%{?rhel} >= 7 +%global name_helper_python3 python%{python3_pkgversion} %if 0%{?with_python2} %{?!python_module:%global python_module() python-%{**} python%{python3_pkgversion}-%{**}} %else %{?!python_module:%global python_module() python%{python3_pkgversion}-%{**}} %endif %else +%global name_helper_python3 python34 %if 0%{?with_python2} %{?!python_module:%global python_module() python-%{**} python34-%{**}} %else @@ -39,6 +42,7 @@ %endif %endif %else +%global name_helper_python3 %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