[python-zfec] Upstream released new version
Ruben Kerkhof
ruben at fedoraproject.org
Wed Mar 9 16:26:10 UTC 2011
commit d82d4fd01f119cc6356cbb2ef1bcf8ac79ad048d
Author: Ruben <ruben at rubenkerkhof.com>
Date: Wed Mar 9 17:25:52 2011 +0100
Upstream released new version
.gitignore | 3 ++
python-zfec.spec | 18 +++++++--------
sources | 2 +-
zfec-fix-setup.patch | 58 ++++++++++---------------------------------------
4 files changed, 24 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17d926a..edd118a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
zfec-1.4.7.tar.gz
+/zfec-1.4.17.tar.gz
+/zfec-1.4.19.tar.gz
+/zfec-1.4.22.tar.gz
diff --git a/python-zfec.spec b/python-zfec.spec
index 61041c5..a631799 100644
--- a/python-zfec.spec
+++ b/python-zfec.spec
@@ -1,9 +1,8 @@
%global libname zfec
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: python-%{libname}
-Version: 1.4.7
-Release: 3%{?dist}
+Version: 1.4.22
+Release: 1%{?dist}
Summary: A fast erasure codec with python bindings
Group: Development/Tools
@@ -13,7 +12,7 @@ Source0: http://pypi.python.org/packages/source/z/%{libname}/%{libname}-%
Patch0: zfec-fix-setup.patch
BuildRequires: python-devel, python-setuptools, pyutil
-Requires: pyutil, python-argparse
+Requires: pyutil
%description
Fast, portable, programmable erasure coding a.k.a. "forward error correction":
@@ -24,8 +23,7 @@ lost then the original data can be recovered from the remaining blocks.
%prep
%setup -q -n %{libname}-%{version}
-# remove the dependency on darcs, we work from a tarball
-# and don't want setuptools to go online and fetch it
+# argparse is in the stdlib in python 2.7, upstream bug #9:
%patch0 -p1
@@ -34,7 +32,6 @@ CFLAGS="%{optflags}" %{__python} setup.py build
%install
-rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
rm -rf %{buildroot}%{_docdir}/%{libname}
@@ -46,15 +43,13 @@ sed -i '/^#!\/usr\/bin\/env/d' %{buildroot}%{python_sitearch}/%{libname}/test/te
sed -i '/^#!\/usr\/bin\/env/d' %{buildroot}%{python_sitearch}/%{libname}/cmdline_zfec.py
sed -i '/^#!\/usr\/bin\/env/d' %{buildroot}%{python_sitearch}/%{libname}/cmdline_zunfec.py
-%clean
-rm -rf %{buildroot}
%check
%{__python} setup.py test
%files
%defattr(-,root,root,-)
-%doc README.txt TODO NEWS.txt COPYING.GPL COPYING.TGPPL.html
+%doc README.rst TODO NEWS.txt COPYING.GPL COPYING.TGPPL.html
%{python_sitearch}/%{libname}
%{python_sitearch}/%{libname}-%{version}-*.egg-info
%{_bindir}/zfec
@@ -62,6 +57,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Mar 08 2011 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.4.22-1
+- Upstream released new version
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index d0deb33..f1c5316 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc8547fef02ef60b160ba6d68e0911e4 zfec-1.4.7.tar.gz
+105745eb9d3db8f909786a0b39153a79 zfec-1.4.22.tar.gz
diff --git a/zfec-fix-setup.patch b/zfec-fix-setup.patch
index c2b1bd1..bef1bc6 100644
--- a/zfec-fix-setup.patch
+++ b/zfec-fix-setup.patch
@@ -1,46 +1,12 @@
-diff -up zfec-1.4.7/setup.cfg.orig zfec-1.4.7/setup.cfg
---- zfec-1.4.7/setup.cfg.orig 2010-06-24 18:21:06.000000000 +0200
-+++ zfec-1.4.7/setup.cfg 2010-06-24 18:21:24.000000000 +0200
-@@ -6,12 +6,3 @@ tag_build =
- tag_date = 0
- tag_svn_revision = 0
-
--[aliases]
--sdist_dsc = darcsver --count-all-patches sdist_dsc
--sdist = darcsver --count-all-patches sdist
--trial = darcsver --count-all-patches trial
--build = darcsver --count-all-patches build
--install = darcsver --count-all-patches install
--test = darcsver --count-all-patches test
--bdist_egg = darcsver --count-all-patches bdist_egg
--
-diff -up zfec-1.4.7/setup.py.orig zfec-1.4.7/setup.py
---- zfec-1.4.7/setup.py.orig 2010-06-24 18:21:33.000000000 +0200
-+++ zfec-1.4.7/setup.py 2010-06-24 18:21:57.000000000 +0200
-@@ -97,26 +97,6 @@ else:
-
- setup_requires = []
-
--# The darcsver command from the darcsver plugin is needed to initialize the
--# distribution's .version attribute correctly. (It does this either by
--# examining darcs history, or if that fails by reading the
--# zfec/_version.py file). darcsver will also write a new version
--# stamp in zfec/_version.py, with a version number derived from
--# darcs history. Note that the setup.cfg file has an "[aliases]" section
--# which enumerates commands that you might run and specifies that it will run
--# darcsver before each one. If you add different commands (or if I forgot
--# some that are already in use), you may need to add it to setup.cfg and
--# configure it to run darcsver before your command, if you want the version
--# number to be correct when that command runs.
--# http://pypi.python.org/pypi/darcsver
--setup_requires.append('darcsver >= 1.2.0')
--
--# setuptools_darcs is required to produce complete distributions (such as with
--# "sdist" or "bdist_egg"), unless there is a zfec.egg-info/SOURCE.txt file
--# present which contains a complete list of files that should be included.
--# http://pypi.python.org/pypi/setuptools_darcs
--setup_requires.append('setuptools_darcs >= 1.1.0')
--
- # stdeb is required to build Debian dsc files.
- if "sdist_dsc" in sys.argv:
- setup_requires.append('stdeb')
+diff -up zfec-1.4.22/setup.py.orig zfec-1.4.22/setup.py
+--- zfec-1.4.22/setup.py.orig 2011-03-08 18:18:54.154001422 +0100
++++ zfec-1.4.22/setup.py 2011-03-08 18:19:06.325001000 +0100
+@@ -157,7 +157,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