This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 336ed1b9f4919bfae6d2631428579212f34e6cc4 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 18 08:20:57 2019 +0100 python-x2go.spec: switch to actually using %{name_helper_python3}. --- debian/changelog | 1 + python-x2go.spec | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index da47a2f..621610b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ python-x2go (0.6.1.2-0x2go1) UNRELEASED; urgency=medium + Add name_helper_python3 macro, simplifying Python 3 package name usage a lot. + Same thing as name_helper_python2 for Python 2 names. + + Switch to actually using %{name_helper_python3}. -- 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 7a61b5a..33a4f88 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -110,8 +110,8 @@ BuildRequires: python-devel BuildRequires: python2-devel %endif %endif -%if 0%{?with_python3} && ( ! ( 0%{?rhel} ) || 0%{?rhel} > 7 ) -BuildRequires: python3-devel +%if 0%{?with_python3} +BuildRequires: %{name_helper_python3}-devel %endif %if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) BuildRequires: python-rpm-macros @@ -191,27 +191,27 @@ Python applications by providing a Python-based X2Go client API. %endif -%if 0%{?with_python3} && ( ! ( 0%{?rhel} ) || 0%{?rhel} > 7 ) -%package -n python3-x2go +%if 0%{?with_python3} +%package -n %{name_helper_python3}-x2go Summary: %{summary} Group: Development/Languages -Requires: python3-gevent -Requires: python3-paramiko >= 1.15.1 +Requires: %{name_helper_python3}-gevent +Requires: %{name_helper_python3}-paramiko >= 1.15.1 %if ( 0%{?sle_version} && 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) -Requires: python3-python-xlib +Requires: %{name_helper_python3}-python-xlib %else -Requires: python3-xlib +Requires: %{name_helper_python3}-xlib %endif -Requires: python3-requests -Requires: python3-simplejson -Requires: python3-future +Requires: %{name_helper_python3}-requests +Requires: %{name_helper_python3}-simplejson +Requires: %{name_helper_python3}-future %if ! 0%{?suse_version} -Requires: python3-configparser +Requires: %{name_helper_python3}-configparser %endif Requires: nxproxy -%{?python_provide:%python_provide python3-%{srcname}} +%{?python_provide:%python_provide %{name_helper_python3}-%{srcname}} -%description -n python3-x2go +%description -n %{name_helper_python3}-x2go X2Go is a server based computing environment with: - session resuming - low bandwidth support @@ -328,8 +328,8 @@ python3 setup.py install --skip-build --root %{buildroot} %endif -%if 0%{?with_python3} && ( ! ( 0%{?rhel} ) || 0%{?rhel} > 7 ) -%files -n python3-x2go +%if 0%{?with_python3} +%files -n %{name_helper_python3}-x2go %defattr(-,root,root) %license COPYING %doc README* TODO -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git