This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to annotated tag 0.6.1.0
in repository x2goclient.
commit b050d3ed1a3a93a40214c4037fbbfefcd66cd413
Author: Mihai Moldovan <io...@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 68a85d4a..4f98e359 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.gabr...@das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43
+0200
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index e28e2257..f35650e4 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/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
