x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

[x2goclient] 13/25: pyhoca-cli.spec: fix selecting either Python 2 XOR 3.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit 1cb84f84cd19cb4cd958d860c291822694045779 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Tue Dec 24 03:46:37 2019 +0100 pyhoca-cli.spec: fix selecting either Python 2 XOR 3. We cannot override bconds via later %bcond_with... XXX macro calls, but have to use them only once with the correct value. Hence, use a global variable to store and mangle the preferences and only use %bcond_... X later once. --- debian/changelog | 4 ++++ pyhoca-cli.spec | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index d95a7d67..905de59b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,10 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium + Fix files section on older *SuSE variants. + Fix files section on older *SuSE variants again, remove faulty slash. + Use %{name} instead of hardcoding the string in %prep. + + Fix selecting either Python 2 XOR 3. We cannot override bconds via later + %bcond_with... XXX macro calls, but have to use them only once with the + correct value. Hence, use a global variable to store and mangle the + preferences and only use %bcond_... X later once. -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index e79bea21..2202d199 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -1,23 +1,44 @@ # Add conditional and ... +# ... disable by default, mostly for older distros. +%global want_python3 0 %if 0%{?suse_version} > 1310 || 0%{?fedora} >= 26 || 0%{?rhel} >= 8 # ... enable by default on newer distros. -%bcond_without python3 -%else -# ... disable by default on older distros. -%bcond_with python3 +%global want_python3 1 %endif # Fedora 30 deprecated Python 2, 31 disabled support for building these # packages. +%global want_python2 1 %if 0%{?fedora} >= 31 -%bcond_with python2 -%else -%bcond_without python2 +%global want_python2 0 %endif # Prefer Python 3 if both variants have been requested. -%if 0%{?with_python2} && 0%{?with_python3} -%bcond_with python2 +%if 0%{?want_python2} && 0%{?want_python3} +%global want_python2 0 +%endif + +# Conditional builds are a bit weird. +# You CAN either enable or disable a feature via %%bcond_with{,out}, BUT you +# can NOT override this value later on, it seems. +# Case in point: I tried to use %bcond_without python2 for all older Fedora +# versions, %bcond_with python3 for all Fedora versions starting with 26. +# However, as pyhoca-{gui,cli} are just applications, we want to build against +# one specific python version only, so I later tried to override the Python-2- +# build via %bcond_with python2, essentially disabling it and preferring the +# Python-3-based version. +# This didn't work, since %{?with_python2} was kept enabled. +# Hence, we'll only enable/disable a feature once now, based upon the global +# macros. +%if 0%{?want_python2} +%bcond_without python2 +%else +%bcond_with python2 +%endif +%if 0%{?want_python3} +%bcond_without python3 +%else +%bcond_with python3 %endif # Provide a default implementation, essentially for non-*SuSE platforms. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 08/25: pyhoca-cli.spec: fix building Python 2 variant on older *SuSE variants.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit 6262249ae6a84900fca6612483ff072a018165f3 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Dec 18 22:13:06 2019 +0100 pyhoca-cli.spec: fix building Python 2 variant on older *SuSE variants. --- debian/changelog | 1 + pyhoca-cli.spec | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index e036cd6d..fbd7de7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium + Replace hashbang with version determined by name helper. + Fix syntax error. + Actually change the hashbang of a file... + + Fix building Python 2 variant on older *SuSE variants. -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 069fba96..79f726b4 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -162,8 +162,16 @@ sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@' 'pyhoca-cli' %build %if 0%{?with_python2} +%if 0%{?suse_version} +%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) +python2 setup.py build +%else +%{python2_build} +%endif +%else %{py2_build} %endif +%endif %if 0%{?with_python3} %if 0%{?suse_version} %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 09/25: pyhoca-cli.spec: also fix install phase for Python 2 variant on older *SuSE variants.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit 1353f72144948471f5fb043096ceff5aaa4c3411 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Dec 18 22:50:38 2019 +0100 pyhoca-cli.spec: also fix install phase for Python 2 variant on older *SuSE variants. --- debian/changelog | 1 + pyhoca-cli.spec | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index fbd7de7f..0f44bead 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium + Fix syntax error. + Actually change the hashbang of a file... + Fix building Python 2 variant on older *SuSE variants. + + Also fix install phase for Python 2 variant on older *SuSE variants. -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 79f726b4..0e170ab7 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -186,8 +186,16 @@ python3 setup.py build %install %if 0%{?with_python2} +%if 0%{?suse_version} +%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) +python2 setup.py install --skip-build --root %{buildroot} +%else +%{python2_install} --skip-build +%endif +%else %{py2_install} %endif +%endif %if 0%{?with_python3} %if 0%{?suse_version} %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 10/25: pyhoca-cli.spec: fix files section on older *SuSE variants.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit 28249414669d5d889f04bd8aa4e768b6a08e7f79 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Thu Dec 19 01:12:46 2019 +0100 pyhoca-cli.spec: fix files section on older *SuSE variants. --- debian/changelog | 1 + pyhoca-cli.spec | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0f44bead..6848d456 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium + Actually change the hashbang of a file... + Fix building Python 2 variant on older *SuSE variants. + Also fix install phase for Python 2 variant on older *SuSE variants. + + Fix files section on older *SuSE variants. -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 0e170ab7..5fdbaa76 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -221,9 +221,20 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %doc COPYING README TODO %{_bindir}/%{name} %if 0%{?with_python2} +%if 0%{?suse_version} +%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) +%{python2_sitelib}/pyhoca/ +%{python2_sitelib}/PyHoca_CLI* +%pycache_only %{python2_sitelib}/__pycache__ +%else +%{python_sitelib}/pyhoca/ +%{python_sitelib}/PyHoca_CLI*/ +%endif +%else %{python2_sitelib}/pyhoca/ %{python2_sitelib}/PyHoca_CLI* %endif +%endif %if 0%{?with_python3} %{python3_sitelib}/pyhoca/ %{python3_sitelib}/PyHoca_CLI* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 04/25: pyhoca-cli.spec: use %{?with_pythonX} and %{name_helper_pythonX} macros.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit 89628dc90c2520872b16db7560e365aa9afa2d6a Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Dec 18 20:57:30 2019 +0100 pyhoca-cli.spec: use %{?with_pythonX} and %{name_helper_pythonX} macros. Also fixes running against nightly versions of python-x2go. --- debian/changelog | 2 ++ pyhoca-cli.spec | 38 ++++++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57953349..670a0933 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium + Backport macros from python-x2go.spec. + Prefer Python 3 if both variants have been requested, so that we only ever build for one variant. + + Use %{?with_pythonX} and %{name_helper_pythonX} macros. Also fixes + running against nightly versions of python-x2go. -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 171fbfeb..73a07cdc 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -107,16 +107,24 @@ URL: http://www.x2go.org/ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch -%if 0%{?el6} || 0%{?el7} +%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: %{name_helper_python2}-devel +%endif BuildRequires: python-setuptools Requires: python-setproctitle -Requires: python-x2go >= 0.6.1.0 -%else -BuildRequires: python3-devel -BuildRequires: python3-setuptools -Requires: python3-setproctitle -Requires: python3-x2go >= 0.6.1.0 +Requires: %{name_helper_python2}-x2go >= 0.6.1.%0 +%endif +if 0%{?with_python3} +BuildRequires: %{name_helper_python3}-devel +BuildRequires: %{name_helper_python3}-setuptools +Requires: %{name_helper_python3}-setproctitle +Requires: %{name_helper_python3}-x2go >= 0.6.1.0 %endif %if 0%{?suse_version} BuildRequires: fdupes @@ -147,10 +155,10 @@ on desktops and thin clients. %build -%if 0%{?el6} || 0%{?el7} -# Make sure we stay on Python 2 on CentOS for the time being. Maybe not for EL8. +%if 0%{?with_python2} %{py2_build} -%else +%endif +%if 0%{?with_python3} %if 0%{?suse_version} %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) python3 setup.py build @@ -163,9 +171,10 @@ python3 setup.py build %endif %install -%if 0%{?el6} || 0%{?el7} +%if 0%{?with_python2} %{py2_install} -%else +%endif +%if 0%{?with_python3} %if 0%{?suse_version} %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) python3 setup.py install -O1 --skip-build --prefix %{_prefix} --root %{buildroot} @@ -189,10 +198,11 @@ cp -rp man/* %{buildroot}/%{_mandir}/ %defattr(-,root,root) %doc COPYING README TODO %{_bindir}/%{name} -%if 0%{?el6} || 0%{?el7} +%if 0%{?with_python2} %{python2_sitelib}/pyhoca/ %{python2_sitelib}/PyHoca_CLI* -%else +%endif +%if 0%{?with_python3} %{python3_sitelib}/pyhoca/ %{python3_sitelib}/PyHoca_CLI* %if 0%{?suse_version} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 06/25: pyhoca-cli.spec: fix syntax error.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit 60753ab932dc80909dcff52106fa0bd7ba90f42f Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Dec 18 21:12:19 2019 +0100 pyhoca-cli.spec: fix syntax error. --- debian/changelog | 1 + pyhoca-cli.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9c878605..a8eef63a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium + Use %{?with_pythonX} and %{name_helper_pythonX} macros. Also fixes running against nightly versions of python-x2go. + Replace hashbang with version determined by name helper. + + Fix syntax error. -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index b9501f10..8788bc8d 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -120,7 +120,7 @@ BuildRequires: python-setuptools Requires: python-setproctitle Requires: %{name_helper_python2}-x2go >= 0.6.1.%0 %endif -if 0%{?with_python3} +%if 0%{?with_python3} BuildRequires: %{name_helper_python3}-devel BuildRequires: %{name_helper_python3}-setuptools Requires: %{name_helper_python3}-setproctitle -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 05/25: pyhoca-cli.spec: replace hashbang with version determined by name helper.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit 6f970b8eddfb691c8ac8bfe455b9ad1e4c80dc84 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Dec 18 21:02:49 2019 +0100 pyhoca-cli.spec: replace hashbang with version determined by name helper. --- debian/changelog | 1 + pyhoca-cli.spec | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 670a0933..9c878605 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium ever build for one variant. + Use %{?with_pythonX} and %{name_helper_pythonX} macros. Also fixes running against nightly versions of python-x2go. + + Replace hashbang with version determined by name helper. -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 73a07cdc..b9501f10 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -152,6 +152,12 @@ on desktops and thin clients. %prep %setup -q +%if 0%{?with_python2} +sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python2}@' +%endif +%if 0%{?with_python3} +sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@' +%endif %build -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 07/25: pyhoca-cli.spec: actually change the hashbang of a file...
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit 1e6223947360e537ba153d3ade30dcc4e459b08a Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Dec 18 21:28:21 2019 +0100 pyhoca-cli.spec: actually change the hashbang of a file... --- debian/changelog | 1 + pyhoca-cli.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a8eef63a..e036cd6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium running against nightly versions of python-x2go. + Replace hashbang with version determined by name helper. + Fix syntax error. + + Actually change the hashbang of a file... -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 8788bc8d..069fba96 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -153,10 +153,10 @@ on desktops and thin clients. %prep %setup -q %if 0%{?with_python2} -sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python2}@' +sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python2}@' 'pyhoca-cli' %endif %if 0%{?with_python3} -sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@' +sed -i -e '1s@^#/usr/bin/python3@/usr/bin/%{name_helper_python3}@' 'pyhoca-cli' %endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 01/25: Continue development
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit 6e5c9bf19c625873e6d0018b3cc2e4d76a2597dd Author: X2Go Release Manager <git-admin(a)x2go.org> Date: Fri Nov 22 15:27:43 2019 +0100 Continue development --- debian/changelog | 6 ++++++ man/man1/pyhoca-cli.1 | 2 +- pyhoca-cli.spec | 2 +- pyhoca/cli/__init__.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9a67eeda..885e6b56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium + + * Continue development + + -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 + pyhoca-cli (0.6.1.1-0x2go1) unstable; urgency=medium [ Mihai Moldovan ] diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 7995d041..c3580f79 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH pyhoca-cli 1 "Nov 2019" "Version 0.6.1.1" "X2Go Application" +.TH pyhoca-cli 1 "Nov 2019" "Version 0.6.1.2" "X2Go Application" .SH NAME pyhoca-cli \- X2Go command line client written in Python .SH SYNOPSIS diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 0d5f549f..a5426402 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -1,5 +1,5 @@ Name: pyhoca-cli -Version: 0.6.1.1 +Version: 0.6.1.2 Release: 0.0x2go1%{?dist} Summary: Command line X2Go client written in Python diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index e4446d5f..7f1dafdd 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki: http://wiki.x2go.org """ -__VERSION__ = "0.6.1.1" +__VERSION__ = "0.6.1.2" from .frontend import * -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 02/25: pyhoca-cli.spec: backport macros from python-x2go.spec.
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.6.1.2 in repository x2goclient. commit d7319594cb6ec474cd6f73e576185fb1927a23d2 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Wed Dec 18 20:41:01 2019 +0100 pyhoca-cli.spec: backport macros from python-x2go.spec. --- debian/changelog | 5 +++- pyhoca-cli.spec | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 885e6b56..dee844da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium - * Continue development + * [ Mihai Moldovan ] + * New upstream version (0.6.1.1): + * pyhoca-cli.spec: + + Backport macros from python-x2go.spec. -- X2Go Release Manager <git-admin(a)x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index a5426402..5e825a3c 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -1,3 +1,92 @@ +# Add conditional and ... +%if 0%{?suse_version} > 1310 || 0%{?fedora} >= 26 || 0%{?rhel} >= 8 +# ... enable by default on newer distros. +%bcond_without python3 +%else +# ... disable by default on older distros. +%bcond_with python3 +%endif + +# Fedora 30 deprecated Python 2, 31 disabled support for building these +# packages. +%if 0%{?fedora} >= 31 +%bcond_with python2 +%else +%bcond_without python2 +%endif + +# 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} +%global name_helper_python2 python2 +%{?!python_module:%global python_module() python-%{**} python3-%{**}} +%else +%global name_helper_python2 %{nil} +%{?!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 %{nil} +%{?!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 %{nil} +%{?!python_module:%global python_module() python34-%{**}} +%endif +%endif +%endif +%else +%global name_helper_python3 %{nil} +%if 0%{?with_python2} +%global name_helper_python2 python +%{?!python_module:%global python_module() python-%{**}} +%else +%global name_helper_python2 %{nil} +%{?!python_module:%global python_module()} +%endif +%endif + +%if ! 0%{?with_python3} +%global skip_python3 1 +%endif + +%if ! 0%{?with_python2} +%global skip_python2 1 +%endif + +# Workaround for OpenSuSE Leap 42.3. This is the first version to introduce +# the macros, but in a broken state. It will generate pythonX dependencies +# if pythonX has been installed in the build environment and not honor +# skip_pythonX. +# Override to the expected behavior. +%if 0%{?sle_version} && 0%{?sle_version} == 120300 && 0%{?is_opensuse} +%if 0%{?with_python3} +%if 0%{?with_python2} +%global python_module() python-%{**} python3-%{**} +%else +%global python_module() python3-%{**} +%endif +%else +%if 0%{?with_python2} +%global python_module() python-%{**} +%else +%global python_module() +%endif +%endif +%endif + Name: pyhoca-cli Version: 0.6.1.2 Release: 0.0x2go1%{?dist} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits