commit 54399fa299987606ca281675d632c954af75845f
Author: Toshio Kuratomi <toshio(a)fedoraproject.org>
Date: Mon Jun 30 15:59:22 2014 -0700
And another bug in sdist
python-setuptools.spec | 7 +++++--
...-sdist-postproc.patch => setuptools-sdist.patch | 9 +++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 472dc1c..a7614ba 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -20,7 +20,7 @@
Name: python-setuptools
Version: 2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Easily build and distribute Python packages
Group: Applications/System
@@ -30,7 +30,7 @@ Source0:
http://pypi.python.org/packages/source/s/%{srcname}/%{srcname}-%
Source1: psfl.txt
Source2: zpl.txt
# Fixed in upstream using a different method
-Patch0: setuptools-sdist-postproc.patch
+Patch0: setuptools-sdist.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -207,6 +207,9 @@ rm -rf %{buildroot}
%endif # with_python3
%changelog
+* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 2.0-7
+- And another bug in sdist
+
* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 2.0-6
- Fix a bug in the sdist command
diff --git a/setuptools-sdist-postproc.patch b/setuptools-sdist.patch
similarity index 72%
rename from setuptools-sdist-postproc.patch
rename to setuptools-sdist.patch
index 413f511..318496b 100644
--- a/setuptools-sdist-postproc.patch
+++ b/setuptools-sdist.patch
@@ -15,3 +15,12 @@ Index: setuptools-2.0/setuptools/command/sdist.py
yield svn_utils.joinpath(dirname,path)
def __call__(self, dirname=''):
path = svn_utils.joinpath(dirname, self.path)
+@@ -48,7 +48,7 @@ class re_finder(object):
+ if os.path.isfile(path):
+ yield path
+ elif os.path.isdir(path):
+- for item in self.find(path):
++ for item in self(path):
+ yield item
+
+