obs/slapos: remove python-setuptools as dependency, it is not needed.

5ceef817 · Rafael Monnerat · bef4e1c8 · 5ceef817 · 5ceef817 · 5ceef817
Commit 5ceef817 authored Aug 24, 2016 by Rafael Monnerat
Showing with 9 additions and 10 deletions

obs/slapos/debian/control obs/slapos/debian/control +1 -2

obs/slapos/templates/slapos.dsc.in obs/slapos/templates/slapos.dsc.in +2 -2

obs/slapos/templates/slapos.spec.in obs/slapos/templates/slapos.spec.in +6 -6

No files found.
--- a/obs/slapos/debian/control
+++ b/obs/slapos/debian/control
@@ -7,8 +7,7 @@ Build-Depends: debhelper (>= 4.1.16),
               po-debconf,
               wget,
               python,
-               python-dev,
-               python-setuptools
+               python-dev
 Homepage: http://www.slapos.org

 Package: slapos-node

--- a/obs/slapos/templates/slapos.dsc.in
+++ b/obs/slapos/templates/slapos.dsc.in
@@ -6,7 +6,7 @@ Version: %VERSION%+%RECIPE_VERSION%+%RELEASE%-1
 Maintainer: Rafael Monnerat <rafael@nexedi.com>
 Homepage: http://community.slapos.org
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 4.1.16), chrpath, po-debconf, wget, python, python-dev, python-setuptools, libssl-dev
+Build-Depends: debhelper (>= 4.1.16), chrpath, po-debconf, wget, python, python-dev, libssl-dev
 Files: 
 1c2803e4693c74042985d753c9c3ba53 73736102 slapos-node_%VERSION%+%RECIPE_VERSION%+%RELEASE%.orig.tar.gz
 1c2803e4693c74042985d753c9c3ba53 6102 slapos-node_%VERSION%+%RECIPE_VERSION%+%RELEASE%-1.diff.tar.gz
--- a/obs/slapos/templates/slapos.spec.in
+++ b/obs/slapos/templates/slapos.spec.in
@@ -44,18 +44,18 @@ Packager: Rafael Monnerat <rafael@nexedi.com>

 %if 0%{?suse_version}
 %if 0%{?suse_version} == 1210
-BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, python-distribute, openssl-devel, python-xml
+BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, openssl-devel, python-xml

-Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-distribute, python-xml
+Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-xml
 %else
-BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, python-setuptools, openssl-devel, python-xml
+BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, openssl-devel, python-xml

-Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-setuptools, python-xml
+Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-xml
 %endif
 %else
-BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, python-setuptools, openssl-devel
+BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, openssl-devel

-Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-setuptools
+Requires: bridge-utils, python, gcc-c++, make, patch, wget
 %endif

 AutoReqProv: no