This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 5f6d607 x2go/inifiles.py: No need to import future's print_function() anymore. new 29cc9b6 python-x2go.spec: rework python_module compat section. new ce77535 python-x2go.spec: add name_helper_python3 macro, simplifying Python 3 package name usage a lot. new 039135b python-x2go.spec: same thing as name_helper_python2 for Python 2 names. new 336ed1b python-x2go.spec: switch to actually using %{name_helper_python3}. new b3782a1 python-x2go.spec: same for %{name_helper_python2}. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 12 ++++++++ python-x2go.spec | 84 +++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 65 insertions(+), 31 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 29cc9b6b04b9ac1f09c6b6e18c490f3948d4a72c Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 18 07:42:11 2019 +0100 python-x2go.spec: 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. --- debian/changelog | 7 +++++++ python-x2go.spec | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dcc8d32..2dc6b26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,13 @@ python-x2go (0.6.1.2-0x2go1) UNRELEASED; urgency=medium - Fix writing of inifiles when running under Python3. - x2go/inifiles.py: No need to import future's print_function() anymore. + [ Mihai Moldovan ] + * New upstream version (0.6.1.2): + * python-x2go.spec: + + 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. + -- X2Go Release Manager <git-admin@x2go.org> Fri, 22 Nov 2019 08:19:40 +0100 python-x2go (0.6.1.1-0x2go1) unstable; urgency=medium diff --git a/python-x2go.spec b/python-x2go.spec index 437b340..f58393d 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -16,13 +16,29 @@ %endif # Provide a default implementation, essentially for non-*SuSE platforms. -%if 0%{?with_python3} && ( ! ( 0%{?rhel} ) || 0%{?rhel} > 7 ) +%if 0%{?with_python3} +%if ( ! ( 0%{?rhel} ) %if 0%{?with_python2} %{?!python_module:%global python_module() python-%{**} python3-%{**}} %else %{?!python_module:%global python_module() python3-%{**}} %endif %else +%if 0%{?rhel} >= 7 +%if 0%{?with_python2} +%{?!python_module:%global python_module() python-%{**} python%{python3_pkgversion}-%{**}} +%else +%{?!python_module:%global python_module() python%{python3_pkgversion}-%{**}} +%endif +%else +%if 0%{?with_python2} +%{?!python_module:%global python_module() python-%{**} python34-%{**}} +%else +%{?!python_module:%global python_module() python34-%{**}} +%endif +%endif +%endif +%else %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
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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit b3782a1094e9e689a929d419616ee1431a7e9df1 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 18 08:21:43 2019 +0100 python-x2go.spec: same for %{name_helper_python2}. --- debian/changelog | 1 + python-x2go.spec | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 621610b..e671322 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ python-x2go (0.6.1.2-0x2go1) UNRELEASED; urgency=medium lot. + Same thing as name_helper_python2 for Python 2 names. + Switch to actually using %{name_helper_python3}. + + Same for %{name_helper_python2}. -- 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 33a4f88..c75ba10 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -105,9 +105,12 @@ BuildArch: noarch # OpenSuSE Leap or SLE and either OpenSuSE Leap 42.2 or lower or SLE %if 0%{?with_python2} %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) +# On some *SuSE versions, we still need python-devel, even though we also enable Python 3 +# builds there and consequently should build-depend upon python2-devel... but it doesn't +# exist there. BuildRequires: python-devel %else -BuildRequires: python2-devel +BuildRequires: %{name_helper_python2}-devel %endif %endif %if 0%{?with_python3} @@ -155,10 +158,7 @@ This Python module allows you to integrate X2Go client support into your Python applications by providing a Python-based X2Go client API. %if 0%{?with_python2} -# Let's assume that RHEL/EPEL 8 finally introduce proper Python 3 support... -%if ( ! 0%{?rhel} ) || 0%{?rhel} >= 8 -%package -n python2-x2go -%endif +%package -n %{name_helper_python2}-x2go Summary: %{summary} Group: Development/Languages Requires: python-gevent @@ -173,10 +173,9 @@ Requires: python-simplejson Requires: python-future Requires: python-configparser Requires: nxproxy -%{?python_provide:%python_provide python2-x2go} +%{?python_provide:%python_provide %{name_helper_python2}-x2go} -%if ( ! 0%{?rhel} ) || 0%{?rhel} >= 8 -%description -n python2-x2go +%description -n %{name_helper_python2}-x2go X2Go is a server based computing environment with: - session resuming - low bandwidth support @@ -188,7 +187,6 @@ X2Go is a server based computing environment with: This Python module allows you to integrate X2Go client support into your Python applications by providing a Python-based X2Go client API. %endif -%endif %if 0%{?with_python3} @@ -304,11 +302,7 @@ python3 setup.py install --skip-build --root %{buildroot} %doc docs/build/html %if 0%{?with_python2} -%if 0%{?rhel} && 0%{?rhel} < 8 -%files -%else -%files -n python2-x2go -%endif +%files -n %{name_helper_python2}-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
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 <ionic@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-admin@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
-
git-admin＠x2go.org