[X2Go-Commits] [python-x2go] 01/01: python-x2go.spec: only fetch python(2)-configparser on *SUSE, not python3-configparser, since that doesn't exist.

git-admin at x2go.org git-admin at x2go.org
Fri Nov 30 04:31:12 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 23cab03e226cbb59ca5dbefc37214c5c442493b4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 30 04:30:51 2018 +0100

    python-x2go.spec: only fetch python(2)-configparser on *SUSE, not python3-configparser, since that doesn't exist.
---
 debian/changelog | 2 ++
 python-x2go.spec | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7388f2d..aadb8b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ python-x2go (0.6.0.2-0x2go1) UNRELEASED; urgency=medium
     - Enable python3 builds on OpenSuSE 13.1+ and Fedora 20+.
     - Fix FC python3-enabling via correct macro and for 26+, OpenSuSE will
       actually be enabled for 13.2+ and add RHEL 8+ condition.
+    - Only fetch python(2)-configparser on *SUSE, not python3-configparser,
+      since that doesn't exist.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 18 Sep 2018 21:17:35 +0200
 
diff --git a/python-x2go.spec b/python-x2go.spec
index e4c4dbb..b5ac7cb 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -76,7 +76,13 @@ BuildRequires:  %{python_module xlib}
 %endif
 BuildRequires:  %{python_module requests}
 BuildRequires:  %{python_module simplejson}
+%if 0%{?suse_version}
+# On *SuSE, we don't have a python3 configparser module, probably because
+# it's part of the standard distribution anyway.
+BuildRequires:  python-configparser
+%else
 BuildRequires:  %{python_module configparser}
+%endif
 
 %description
 X2Go is a server based computing environment with:
@@ -140,7 +146,9 @@ Requires:       python3-xlib
 Requires:       python3-requests
 Requires:       python3-simplejson
 Requires:       python3-future
+%if ! 0%{?suse_version}
 Requires:       python3-configparser
+%endif
 Requires:       nxproxy
 %{?python_provide:%python_provide python3-%{srcname}}
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git


More information about the x2go-commits mailing list