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 1b3cd85b3442f59b0aac56b45e3a74e0055fe949
Author: Mihai Moldovan <io...@ionic.de>
Date: Sat Nov 10 09:40:59 2018 +0100
pyhoca-cli.spec: build with Python 2 on CentOS, drop python3-argparse
dependency (part of stdlib).
---
debian/changelog | 6 ++++++
pyhoca-cli.spec | 20 +++++++++++++++-----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index db495d65..35a92d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,12 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
* debian/control:
+ Set Section: from "python" to "x11". More appropriate.
+ [ Mihai Moldovan ]
+ * New upstream version (0.6.0.1):
+ * pyhoca-cli.spec:
+ - Build with Python 2 on CentOS, drop python3-argparse
+ dependency (part of stdlib).
+
-- Mike Gabriel <mike.gabr...@das-netzwerkteam.de> Wed, 19 Sep 2018 15:20:43
+0200
pyhoca-cli (0.6.0.0-0x2go1) unstable; urgency=medium
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index c2cc5751..23921b94 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -13,14 +13,20 @@ URL: http://www.x2go.org/
Source0:
http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
+%if 0%{?el6} && 0%{?el7}
+BuildRequires: python-devel
+BuildRequires: python-setuptools
+Requires: python-setproctitle
+Requires: python-x2go >= 0.6.0.1
+%else
BuildRequires: python3-devel
-%if 0%{?suse_version}
-BuildRequires: fdupes
-%endif
BuildRequires: python3-setuptools
Requires: python3-setproctitle
Requires: python3-x2go >= 0.6.0.1
-Requires: python3-argparse
+%fi
+%if 0%{?suse_version}
+BuildRequires: fdupes
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,8 +50,12 @@ 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
+%else
%{__python3} setup.py build
-
+%endif
%install
%{__python3} setup.py install -O1 --skip-build --prefix %{_prefix} --root
%{buildroot}
--
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
