factory sync

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=22

python-setuptools.spec

@@ -19,9 +19,9 @@
 
 
 Name:           python-setuptools
-BuildRequires:  python-devel
+BuildRequires:  fdupes python-base
 Version:        0.6c9
-Release:        1
+Release:        10
 Summary:        Download, build, install, upgrade, and uninstall Python packages -- easily!
 Group:          Development/Libraries/Python
 License:        Other uncritical OpenSource License; Python Copyright
@@ -29,8 +29,9 @@ Url:            http://cheeseshop.python.org/pypi/setuptools
 Source:         setuptools-%{version}.tar.bz2
 Source1:        psfl.txt
 Source2:        zpl.txt
+Patch1:         python-setuptools-distutils-log.diff
+Patch2:         setuptools-0.6c9-create-sitedir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       python-devel
 %py_requires
 
 %description
@@ -46,6 +47,8 @@ Authors:
 
 %prep
 %setup -q -n setuptools-%{version}
+%patch1 -p0
+%patch2
 chmod -x *.txt
 find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
 
@@ -62,6 +65,7 @@ install -p -m 0644 %{SOURCE1} %{SOURCE2} .
 find $RPM_BUILD_ROOT%{py_sitedir} -name '*.exe' | xargs rm -f
 find $RPM_BUILD_ROOT%{py_sitedir} -name '*.txt' | xargs chmod -x
 chmod +x $RPM_BUILD_ROOT%{py_sitedir}/setuptools/command/easy_install.py
+%fdupes $RPM_BUILD_ROOT%{py_sitedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/*
 
 %changelog
+* Wed Oct 22 2008 skh@suse.de
+- add python-setuptools-distutils-log.diff:
+  setuptools/command/sdist.py: import distutils.log [bnc#428177]
+- add python-setuptools-svn15.diff:
+  setuptools/command/egg_info.py: recognize svn format version 1.5 magic
+  number [also bnc#428177]
 * Mon Aug 18 2008 cthiel@suse.de
 - update to version 0.6c8
   * Prevent ``--help-commands`` and other junk from showing under Python 2.5