This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-cli. from b8bf324 pyhoca-cli.spec: it's still %endif, not %fi. new 55d4bfc pyhoca-cli.spec: either EL6 or EL7, not both at the same time. new b050d3e pyhoca-cli.spec: use modern python build and install macros. The 2 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 | 2 ++ pyhoca-cli.spec | 30 +++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit 55d4bfc1a61798110794ef5d03452dfc659c08a8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 10 12:57:57 2018 +0100 pyhoca-cli.spec: either EL6 or EL7, not both at the same time. --- debian/changelog | 1 + pyhoca-cli.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b403670..68a85d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium - Build with Python 2 on CentOS, drop python3-argparse dependency (part of stdlib). - It's still %endif, not %fi. + - Either EL6 or EL7, not both at the same time. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 6e2c7bd..e28e225 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -13,7 +13,7 @@ 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%{?el6} || 0%{?el7} BuildRequires: python-devel BuildRequires: python-setuptools Requires: python-setproctitle @@ -50,7 +50,7 @@ on desktops and thin clients. %build -%if 0%{?el6} && 0%{?el7} +%if 0%{?el6} || 0%{?el7} # Make sure we stay on Python 2 on CentOS for the time being. Maybe not for EL8. %{__python2} setup.py build %else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit b050d3ed1a3a93a40214c4037fbbfefcd66cd413 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 10 13:16:47 2018 +0100 pyhoca-cli.spec: use modern python build and install macros. --- debian/changelog | 1 + pyhoca-cli.spec | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 68a85d4..4f98e35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium dependency (part of stdlib). - It's still %endif, not %fi. - Either EL6 or EL7, not both at the same time. + - Use modern python build and install macros. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43 +0200 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index e28e225..f35650e 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -52,13 +52,33 @@ 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. -%{__python2} setup.py build +%{py2_build} %else -%{__python3} setup.py build +%if 0%{?suse_version} +%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) +python3 setup.py build +%else +%{python3_build} +%endif +%else +%{py3_build} +%endif %endif %install -%{__python3} setup.py install -O1 --skip-build --prefix %{_prefix} --root %{buildroot} +%if 0%{?el6} || 0%{?el7} +%{py2_install} +%else +%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} +%else +%{python3_install} -O1 --skip-build +%endif +%else +%{py3_install} +%endif +%endif mkdir -p %{buildroot}/%{_bindir}/ cp -p %{name} %{buildroot}/%{_bindir}/ mkdir -p %{buildroot}/%{_mandir}/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git
-
git-admin＠x2go.org