rpms/pycryptopp/devel pycryptopp-do_not_regenerate_darcs_stuff.patch, NONE, 1.1 import.log, 1.1, 1.2 pycryptopp.spec, 1.1, 1.2

[Ruben Kerkhof]

Author: ruben

Update of /cvs/pkgs/rpms/pycryptopp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6593/devel

Modified Files:
	import.log pycryptopp.spec 
Added Files:
	pycryptopp-do_not_regenerate_darcs_stuff.patch 
Log Message:
Bump version


pycryptopp-do_not_regenerate_darcs_stuff.patch:
 setup.cfg |    9 ---------
 setup.py  |   20 --------------------
 2 files changed, 29 deletions(-)

--- NEW FILE pycryptopp-do_not_regenerate_darcs_stuff.patch ---
--- pycryptopp-0.5.17/setup.cfg.orig
+++ pycryptopp-0.5.17/setup.cfg
@@ -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
-
--- pycryptopp-0.5.17/setup.py.orig
+++ pycryptopp-0.5.17/setup.py
@@ -207,31 +207,11 @@ dependency_links=[os.path.join(miscdeps,
 setup_requires = []
 install_requires = ['setuptools >= 0.6a9'] # for pkg_resources for loading test vectors for unit tests
 
-# The darcsver command from the darcsver plugin is needed to initialize the
-# distribution's .version attribute. (It does this either by examining darcs
-# history, or if that fails by reading the pycryptopp/_version.py
-# file). darcsver will also write a new version stamp in
-# pycryptopp/_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_pyflakes is needed only if you want "./setup.py flakes" to run
 # pyflakes on all the pycryptopp modules.
 if 'flakes' in sys.argv[1:]:
     setup_requires.append('setuptools_pyflakes >= 1.0.0')
 
-# setuptools_darcs is required to produce complete distributions (such as
-# with "sdist" or "bdist_egg"), unless there is a
-# pycryptopp.egg-info/SOURCES.txt file present which contains a complete list
-# of needed files.
-# http://pypi.python.org/pypi/setuptools_darcs
-setup_requires.append('setuptools_darcs >= 1.0.5')
-
 # stdeb is required to produce Debian files with "sdist_dsc".
 # http://github.com/astraw/stdeb/tree/master
 if "sdist_dsc" in sys.argv:


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pycryptopp/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	16 Nov 2009 10:41:06 -0000	1.1
+++ import.log	16 Nov 2009 12:36:41 -0000	1.2
@@ -1 +1,2 @@
 pycryptopp-0_5_17-3_fc11:HEAD:pycryptopp-0.5.17-3.fc11.src.rpm:1258368050
+pycryptopp-0_5_17-4_fc11:HEAD:pycryptopp-0.5.17-4.fc11.src.rpm:1258374984


Index: pycryptopp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycryptopp/devel/pycryptopp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pycryptopp.spec	16 Nov 2009 10:41:06 -0000	1.1
+++ pycryptopp.spec	16 Nov 2009 12:36:41 -0000	1.2
@@ -2,17 +2,28 @@
 
 Name:           pycryptopp
 Version:        0.5.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python wrappers for the Crypto++ library
 
 Group:          Development/Languages
+
+# we don't use the embedded cryptopp library
+# but link against the one in Fedora
+# 
+# all the files we distribute in the binary rpm
+# are GPLv2+ or TGPPL
+#
+# see copyright for details
 License:        GPLv2+
+
 URL:            http://allmydata.org/trac/pycryptopp
 Source0:        http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, cryptopp-devel, python-setuptools
 
+Patch0:         pycryptopp-do_not_regenerate_darcs_stuff.patch
+
 %description
 PyCryptopp is a set of Python wrappers for a few
 of the best crypto algorithms from the Crypto++ library
@@ -20,6 +31,7 @@ of the best crypto algorithms from the C
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -46,12 +58,18 @@ rm -rf %{buildroot}%{python_sitearch}/%{
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.GPL COPYING.TGPPL.html README.txt
+%doc COPYING.GPL COPYING.TGPPL.html README.txt ChangeLog copyright
 %{python_sitearch}/*
 
 
 %changelog
-* Thu Sep 24 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.17-3
+* Mon Nov 16 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.17-4
+- Initial import into devel
+
+* Wed Nov 11 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.17-2
+- Review fixes (#521719)
+
+* Thu Sep 24 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.17-1
 - Upstream released new version
 
 * Mon Sep 14 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.15-3