This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit fd1eed9c5dad12af2cf2882294b389ee0a15938c Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 21 04:18:02 2019 +0100 pyhoca-gui.spec: replace hashbang in %prep. --- debian/changelog | 1 + pyhoca-gui.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d7f1f3..1909890 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ pyhoca-gui (0.6.1.0-0x2go1) UNRELEASED; urgency=medium + Copy Python 2/3 helpers from PyHoca CLI. + Adapt Build-Requires to Python 2/3 logic. + Adapt Requires to Python 2/3 logic. + + Replace hashbang in %prep. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 11 Dec 2019 12:47:21 +0100 diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec index ba9d21d..7fc2113 100644 --- a/pyhoca-gui.spec +++ b/pyhoca-gui.spec @@ -186,12 +186,16 @@ notification area and allows multiple X2Go session handling. %prep %setup -q - +%if 0%{?with_python2} +sed -i -e '1s@^#/usr/bin/env python3@/usr/bin/env %{name_helper_python2}@' '%{name}' +%endif +%if 0%{?with_python3} +sed -i -e '1s@^#/usr/bin/env python3@/usr/bin/env %{name_helper_python3}@' '%{name}' +%endif %build %if 0%{?suse_version} %if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) -sed -i %{name} -e "s@/usr/bin/env python3@/usr/bin/env python2@" python2 setup.py build_i18n python2 setup.py build %else @@ -203,7 +207,6 @@ python2 setup.py build %{__python3} setup.py build_i18n %{py3_build} %else -sed -i %{name} -e "s@/usr/bin/env python3@/usr/bin/env python2@" %{__python2} setup.py build_i18n %{py2_build} %endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git