This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 1cf4fb2cc0613cac5bc881d71c24c3b3c60ea80a Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 2 07:08:31 2018 +0200 python-x2go.spec: %{sle_version} is not defined on TW, so use a %{suse_version} check additionally to catch this variant. --- debian/changelog | 2 ++ python-x2go.spec | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 886cd98..30bc359 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,8 @@ python-x2go (0.5.99.1-0x2go1) UNRELEASED; urgency=medium - Document %(python_module} definitions. - Override python_module macro for OpenSuSE Leap 42.3, the shipped version does not what later versions do correctly. + - %{sle_version} is not defined on TW, so use a %{suse_version} check + additionally to catch this variant. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 22 Sep 2017 14:15:05 +0200 diff --git a/python-x2go.spec b/python-x2go.spec index eb2223b..b751ece 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -49,7 +49,7 @@ BuildRequires: python2-devel %if 0%{?with_python3} && ( ! ( 0%{?rhel} ) || 0%{?rhel} > 7 ) BuildRequires: python3-devel %endif -%if 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} +%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) BuildRequires: python-rpm-macros %endif BuildRequires: fdupes @@ -63,7 +63,7 @@ BuildRequires: %{python_module sphinx} BuildRequires: %{python_module future} BuildRequires: %{python_module gevent} BuildRequires: %{python_module paramiko} -%if 0%{?sle_version} && 0%{?sle_version} >= 150000 && 0%{?is_opensuse} +%if ( 0%{?sle_version} && 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) BuildRequires: %{python_module python-xlib} %else BuildRequires: %{python_module xlib} @@ -93,7 +93,7 @@ Summary: %{summary} Group: Development/Languages Requires: python-gevent Requires: python-paramiko >= 1.15.1 -%if 0%{?sle_version} && 0%{?sle_version} >= 150000 && 0%{?is_opensuse} +%if ( 0%{?sle_version} && 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) Requires: python-python-xlib %else Requires: python-xlib @@ -126,7 +126,7 @@ Summary: %{summary} Group: Development/Languages Requires: python3-gevent Requires: python3-paramiko >= 1.15.1 -%if 0%{?sle_version} && 0%{?sle_version} >= 150000 && 0%{?is_opensuse} +%if ( 0%{?sle_version} && 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) Requires: python3-python-xlib %else Requires: python3-xlib @@ -232,7 +232,7 @@ python3 setup.py install --skip-build --root %{buildroot} %license COPYING %doc README* TODO %if 0%{?suse_version} -%if 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} +%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) %{python2_sitelib}/* %pycache_only %{python2_sitelib}/__pycache__ %else @@ -250,7 +250,7 @@ python3 setup.py install --skip-build --root %{buildroot} %doc README* TODO %{python3_sitelib}/* %if 0%{?suse_version} -%if 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} +%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) %pycache_only %{python3_sitelib}/__pycache__ %endif %endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git