From 54399fa299987606ca281675d632c954af75845f Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Jun 30 2014 22:59:22 +0000
Subject: And another bug in sdist


---

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@fedoraproject.org> - 2.0-7
+- And another bug in sdist
+
 * Mon Jun 30 2014 Toshio Kuratomi <toshio@fedoraproject.org> - 2.0-6
 - Fix a bug in the sdist command
 
diff --git a/setuptools-sdist-postproc.patch b/setuptools-sdist-postproc.patch
deleted file mode 100644
index 413f511..0000000
--- a/setuptools-sdist-postproc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: setuptools-2.0/setuptools/command/sdist.py
-===================================================================
---- setuptools-2.0.orig/setuptools/command/sdist.py
-+++ setuptools-2.0/setuptools/command/sdist.py
-@@ -35,10 +35,10 @@ class re_finder(object):
-             f.close()
-         for match in self.pattern.finditer(data):
-             path = match.group(1)
--            if postproc:
-+            if self.postproc:
-                 #postproc used to be used when the svn finder
-                 #was an re_finder for calling unescape
--                path = postproc(path)
-+                path = self.postproc(path)
-             yield svn_utils.joinpath(dirname,path)
-     def __call__(self, dirname=''):
-         path = svn_utils.joinpath(dirname, self.path)
diff --git a/setuptools-sdist.patch b/setuptools-sdist.patch
new file mode 100644
index 0000000..318496b
--- /dev/null
+++ b/setuptools-sdist.patch
@@ -0,0 +1,26 @@
+Index: setuptools-2.0/setuptools/command/sdist.py
+===================================================================
+--- setuptools-2.0.orig/setuptools/command/sdist.py
++++ setuptools-2.0/setuptools/command/sdist.py
+@@ -35,10 +35,10 @@ class re_finder(object):
+             f.close()
+         for match in self.pattern.finditer(data):
+             path = match.group(1)
+-            if postproc:
++            if self.postproc:
+                 #postproc used to be used when the svn finder
+                 #was an re_finder for calling unescape
+-                path = postproc(path)
++                path = self.postproc(path)
+             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
+ 
+