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

[Ruben Kerkhof]

Author: ruben

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

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



Index: python-zbase32.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-zbase32/devel/python-zbase32.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-zbase32.spec	24 Jun 2010 16:37:37 -0000	1.4
+++ python-zbase32.spec	24 Jun 2010 16:51:38 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:       python-%{libname}
 Version:    1.1.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A base32 encoder/decoder
 
 Group:      Development/Tools
@@ -47,6 +47,9 @@ python setup.py test
 
 
 %changelog
+* Thu Jun 24 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.1.2-3
+- Re-diff patch
+
 * Thu Jun 24 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.1.2-2
 - Re-add patch
 

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

Index: zbase32-disable-darcs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-zbase32/devel/zbase32-disable-darcs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zbase32-disable-darcs.patch	24 Jun 2010 16:37:37 -0000	1.3
+++ zbase32-disable-darcs.patch	24 Jun 2010 16:51:38 -0000	1.4
@@ -1,16 +1,22 @@
-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')
+diff -up zbase32-1.1.2/setup.py.orig zbase32-1.1.2/setup.py
+--- zbase32-1.1.2/setup.py.orig	2010-06-24 18:48:35.000000000 +0200
++++ zbase32-1.1.2/setup.py	2010-06-24 18:48:59.000000000 +0200
+@@ -53,18 +53,6 @@ else:
+         print "unable to find version in %s" % (VERSIONFILE,)
+         raise RuntimeError("if %s.py exists, it must be well-formed" % (VERSIONFILE,))
  
+-# darcsver is needed only if you want "./setup.py darcsver" to write a new
+-# version stamp in pyutil/_version.py, with a version number derived from
+-# darcs history.  http://pypi.python.org/pypi/darcsver
+-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,
+ setup(name=PKG,
+       version=verstr,
+       description='base32 encoder/decoder',