[python-zfec] Update patch to avoid use of bundled setuptools (#1106939)
Yaakov Selkowitz
yselkowitz at fedoraproject.org
Fri Aug 1 07:31:02 UTC 2014
commit 39693d6f571c829a17a0fd9e1e718f9304848543
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date: Fri Aug 1 02:30:48 2014 -0500
Update patch to avoid use of bundled setuptools (#1106939)
python-zfec.spec | 8 +++++++-
zfec-fix-setup.patch | 9 ---------
2 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/python-zfec.spec b/python-zfec.spec
index 3e0826c..0a4e0fc 100644
--- a/python-zfec.spec
+++ b/python-zfec.spec
@@ -1,10 +1,12 @@
Name: python-zfec
Version: 1.4.24
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A fast erasure codec with python bindings
License: GPLv2+
URL: http://allmydata.org/trac/zfec
Source0: http://pypi.python.org/packages/source/z/zfec/zfec-%{version}.tar.gz
+Patch0: zfec-fix-setup.patch
+
BuildRequires: python2-devel
BuildRequires: python-setuptools
BuildRequires: python-setuptools_trial
@@ -18,6 +20,7 @@ lost then the original data can be recovered from the remaining blocks.
%prep
%setup -qn zfec-%{version}
+%patch0 -p1
rm -rf *.egg
rm -rf *.egg-info
@@ -47,6 +50,9 @@ sed -i '/^#!\/usr\/bin\/env/d' %{buildroot}%{python_sitearch}/zfec/cmdline_zunfe
%{python2_sitearch}/zfec-%{version}-py%{python2_version}.egg-info
%changelog
+* Fri Aug 01 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 1.4.24-8
+- Update patch to avoid use of bundled setuptools (#1106939)
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.24-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/zfec-fix-setup.patch b/zfec-fix-setup.patch
index cddf79d..a9b8d54 100644
--- a/zfec-fix-setup.patch
+++ b/zfec-fix-setup.patch
@@ -12,12 +12,3 @@ diff -up zfec-1.4.22/setup.py.orig zfec-1.4.22/setup.py
from setuptools import Extension, find_packages, setup
if "--debug" in sys.argv:
-@@ -157,7 +153,7 @@ setup(name=PKG,
- author_email='zooko at zooko.com',
- url='http://tahoe-lafs.org/trac/'+PKG,
- license='GNU GPL',
-- install_requires=["argparse >= 0.8", "pyutil >= 1.3.19"],
-+ install_requires=["pyutil >= 1.3.19"],
- tests_require=tests_require,
- packages=find_packages(),
- include_package_data=True,
More information about the scm-commits
mailing list