[X2Go-Commits] [x2gobroker] 01/01: x2gobroker.spec: CentOS 6 + 7 have python34-setuptools, not python3-setuptools.

git-admin at x2go.org git-admin at x2go.org
Mon Feb 12 22:10:52 CET 2018


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

x2go pushed a commit to branch master
in repository x2gobroker.

commit 32a4fdc336d15f7f6f30115b920e8f4ea791ad1e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 12 22:10:34 2018 +0100

    x2gobroker.spec: CentOS 6 + 7 have python34-setuptools, not python3-setuptools.
---
 debian/changelog | 1 +
 x2gobroker.spec  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index edb21da..dea8588 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium
     + Bump package version.
     + CentOS 6 + 7 have python34-devel, not python3-devel.
     + Enable debug_packages for openSUSE Tumbleweed (suse_version > 1500).
+    + CentOS 6 + 7 have python34-setuptools, not python3-setuptools. 
 
  -- X2Go Release Manager <git-admin at x2go.org>  Wed, 05 Apr 2017 20:01:48 +0000
 
diff --git a/x2gobroker.spec b/x2gobroker.spec
index 009f07a..a11408d 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -23,14 +23,16 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %if 0%{?el6} || 0%{?el7}
 BuildRequires:  python34-devel
+BuildRequires:  python34-setuptools
 %else
 BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 %endif
 %if 0%{?suse_version}
 BuildRequires:  fdupes
 %endif
 BuildRequires:  sudo
-BuildRequires:  python3-setuptools
+
 %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230
 BuildRequires:  systemd
 %endif

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


More information about the x2go-commits mailing list