rpms/pycryptopp/devel pycryptopp-unbundle.patch, NONE, 1.1 pycryptopp.spec, 1.5, 1.6

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/pycryptopp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3419

Modified Files:
	pycryptopp.spec 
Added Files:
	pycryptopp-unbundle.patch 
Log Message:

* Tue Jul 27 2010 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.19-3
- Remove the bundled modules
- Patch so we build without hte bundled modules


pycryptopp-unbundle.patch:
 setup.cfg |   14 +++++++-------
 setup.py  |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE pycryptopp-unbundle.patch ---
Index: pycryptopp-0.5.19/setup.cfg
===================================================================
--- pycryptopp-0.5.19.orig/setup.cfg
+++ pycryptopp-0.5.19/setup.cfg
@@ -7,11 +7,11 @@ 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
+#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
 
Index: pycryptopp-0.5.19/setup.py
===================================================================
--- pycryptopp-0.5.19.orig/setup.py
+++ pycryptopp-0.5.19/setup.py
@@ -214,7 +214,7 @@ install_requires = ['setuptools >= 0.6a9
 # 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')
+#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.
@@ -226,7 +226,7 @@ if 'flakes' in sys.argv[1:]:
 # 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')
+#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


Index: pycryptopp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycryptopp/devel/pycryptopp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pycryptopp.spec	22 Jul 2010 03:15:33 -0000	1.5
+++ pycryptopp.spec	27 Jul 2010 20:28:50 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pycryptopp
 Version:        0.5.19
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python wrappers for the Crypto++ library
 
 Group:          Development/Languages
@@ -18,6 +18,7 @@ License:        GPLv2+
 
 URL:            http://allmydata.org/trac/pycryptopp
 Source0:        http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+Patch0: pycryptopp-unbundle.patch
 
 BuildRequires:  python-devel, cryptopp-devel, python-setuptools
 
@@ -28,14 +29,17 @@ of the best crypto algorithms from the C
 
 %prep
 %setup -q
+%patch0 -p1
 
+rm -rf darcsver-*.egg
+rm -rf setuptools_darcs-*.egg
 
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build --disable-embedded-cryptopp
 
 
 %install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 rm -rf %{buildroot}%{_docdir}/%{name}/
 
 
@@ -55,6 +59,10 @@ rm -rf %{buildroot}%{python_sitearch}/%{
 
 
 %changelog
+* Tue Jul 27 2010 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.19-3
+- Remove the bundled modules
+- Patch so we build without hte bundled modules
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.5.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild