rpms/python-zbase32/devel zbase32-disable-darcs.patch, 1.2, 1.3 python-zbase32.spec, 1.3, 1.4

[Ruben Kerkhof]

Author: ruben

Update of /cvs/pkgs/rpms/python-zbase32/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24487

Modified Files:
	python-zbase32.spec 
Added Files:
	zbase32-disable-darcs.patch 
Log Message:
* Thu Jun 24 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.1.2-2
- Re-add patch


zbase32-disable-darcs.patch:
 setup.py |    6 ------
 1 file changed, 6 deletions(-)

Index: zbase32-disable-darcs.patch
===================================================================
RCS file: zbase32-disable-darcs.patch
diff -N zbase32-disable-darcs.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ zbase32-disable-darcs.patch	24 Jun 2010 16:37:37 -0000	1.3
@@ -0,0 +1,16 @@
+diff -up zbase32-1.1.1/setup.py.orig zbase32-1.1.1/setup.py
+--- zbase32-1.1.1/setup.py.orig	2010-02-09 17:13:42.000000000 +0100
++++ zbase32-1.1.1/setup.py	2010-02-09 17:14:16.000000000 +0100
+@@ -70,12 +70,6 @@ else:
+ if 'darcsver' in sys.argv[1:]:
+     setup_requires.append('darcsver >= 1.0.0')
+ 
+-# setuptools_darcs is required to produce complete distributions (such as with
+-# "sdist" or "bdist_egg"), unless there is a pyutil.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')
+-
+ def _setup(test_suite):
+     setup(name=PKG,
+           version=verstr,


Index: python-zbase32.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-zbase32/devel/python-zbase32.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- python-zbase32.spec	24 Jun 2010 16:12:50 -0000	1.3
+++ python-zbase32.spec	24 Jun 2010 16:37:37 -0000	1.4
@@ -3,13 +3,14 @@
 
 Name:       python-%{libname}
 Version:    1.1.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A base32 encoder/decoder
 
 Group:      Development/Tools
 License:    BSD and LGPLv2
 URL:        http://allmydata.org/trac/%{libname}
 Source0:    http://pypi.python.org/packages/source/z/%{libname}/%{libname}-%{version}.tar.gz
+Patch0:     zbase32-disable-darcs.patch
 BuildArch:  noarch
 
 Requires:   pyutil
@@ -20,6 +21,8 @@ An alternate base32 encoder (not RFC 354
 
 %prep
 %setup -q -n %{libname}-%{version}
+# stop setuptools from looking for setuptools_darcs
+%patch0 -p1
 
 
 %build
@@ -44,6 +47,9 @@ python setup.py test
 
 
 %changelog
+* Thu Jun 24 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.1.2-2
+- Re-add patch
+
 * Thu Jun 24 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.1.2-1
 - Upstream released new version