[python-setuptools] Fix a bug in the sdist command
Toshio くらとみ
toshio at fedoraproject.org
Mon Jun 30 22:15:35 UTC 2014
commit 72f65d9dc14c37f889a3b42a8d93bc74511a0f60
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Mon Jun 30 15:15:36 2014 -0700
Fix a bug in the sdist command
python-setuptools.spec | 8 +++++++-
setuptools-sdist-postproc.patch | 17 +++++++++++++++++
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/python-setuptools.spec b/python-setuptools.spec
index a5e495b..472dc1c 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -20,7 +20,7 @@
Name: python-setuptools
Version: 2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Easily build and distribute Python packages
Group: Applications/System
@@ -29,6 +29,8 @@ URL: http://pypi.python.org/pypi/%{srcname}
Source0: http://pypi.python.org/packages/source/s/%{srcname}/%{srcname}-%{version}.tar.gz
Source1: psfl.txt
Source2: zpl.txt
+# Fixed in upstream using a different method
+Patch0: setuptools-sdist-postproc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,6 +95,7 @@ execute the software that requires pkg_resources.py.
%prep
%setup -q -n %{srcname}-%{version}
+%patch0 -p1
find -name '*.txt' -exec chmod -x \{\} \;
find . -name '*.orig' -exec rm \{\} \;
@@ -204,6 +207,9 @@ rm -rf %{buildroot}
%endif # with_python3
%changelog
+* Mon Jun 30 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 2.0-6
+- Fix a bug in the sdist command
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/setuptools-sdist-postproc.patch b/setuptools-sdist-postproc.patch
new file mode 100644
index 0000000..413f511
--- /dev/null
+++ b/setuptools-sdist-postproc.patch
@@ -0,0 +1,17 @@
+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)
More information about the scm-commits
mailing list