[pycryptopp] - Update release at upstream's request. The source code looks reasonably safe

[Toshio くらとみ]

commit 7a19155a88e857f16e9e1a1797640b17c7176a78
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Sep 23 17:16:00 2010 -0400

    - Update release at upstream's request.  The source code looks reasonably safe

 .gitignore                |    1 +
 pycryptopp-unbundle.patch |   53 ++++++++++++++++++++++++++++-----------------
 pycryptopp.spec           |   11 ++++++--
 sources                   |    2 +-
 4 files changed, 43 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cb5a2f2..65b629a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pycryptopp-0.5.19.tar.gz
+/pycryptopp-0.5.25.tar.gz
diff --git a/pycryptopp-unbundle.patch b/pycryptopp-unbundle.patch
index 3e813b5..ffe8078 100644
--- a/pycryptopp-unbundle.patch
+++ b/pycryptopp-unbundle.patch
@@ -1,40 +1,53 @@
-Index: pycryptopp-0.5.19/setup.cfg
+Index: pycryptopp-0.5.25/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
+--- pycryptopp-0.5.25.orig/setup.cfg
++++ pycryptopp-0.5.25/setup.cfg
+@@ -2,13 +2,13 @@
+ zip_ok = False
  
  [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
+-sdist = darcsver --count-all-patches sdist
+-install = darcsver --count-all-patches install
 -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
+-trial = darcsver --count-all-patches trial
+-sdist_dsc = darcsver --count-all-patches sdist_dsc
 +#build = darcsver --count-all-patches build
-+#install = darcsver --count-all-patches install
 +#test = darcsver --count-all-patches test
++#sdist = darcsver --count-all-patches sdist
++#install = darcsver --count-all-patches install
 +#bdist_egg = darcsver --count-all-patches bdist_egg
++#trial = darcsver --count-all-patches trial
++#sdist_dsc = darcsver --count-all-patches sdist_dsc
  
-Index: pycryptopp-0.5.19/setup.py
+ [egg_info]
+ tag_build = 
+Index: pycryptopp-0.5.25/setup.py
 ===================================================================
---- pycryptopp-0.5.19.orig/setup.py
-+++ pycryptopp-0.5.19/setup.py
-@@ -214,7 +214,7 @@ install_requires = ['setuptools >= 0.6a9
+--- pycryptopp-0.5.25.orig/setup.py
++++ pycryptopp-0.5.25/setup.py
+@@ -8,8 +8,8 @@
+ 
+ import glob, os, platform, re, subprocess, sys
+ 
+-egg = os.path.realpath(glob.glob('darcsver-*.egg')[0])
+-sys.path.insert(0, egg)
++#egg = os.path.realpath(glob.glob('darcsver-*.egg')[0])
++#sys.path.insert(0, egg)
+ 
+ from setuptools import Extension, find_packages, setup
+ 
+@@ -225,7 +225,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')
+-setup_requires.append('darcsver >= 1.6.3')
++#setup_requires.append('darcsver >= 1.6.3')
  
  # 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:]:
+@@ -237,7 +237,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
diff --git a/pycryptopp.spec b/pycryptopp.spec
index 89747ce..3f627bf 100644
--- a/pycryptopp.spec
+++ b/pycryptopp.spec
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pycryptopp
-Version:        0.5.19
-Release:        4%{?dist}
+Version:        0.5.25
+Release:        1%{?dist}
 Summary:        Python wrappers for the Crypto++ library
 
 Group:          Development/Languages
@@ -50,6 +50,9 @@ CFLAGS="%{optflags}" %{__python} setup.py test
 rm -rf %{buildroot}%{python_sitearch}/%{name}/test/
 rm -rf %{buildroot}%{python_sitearch}/%{name}/testvectors/
 
+# This file isn't needed.  It's used to mark the embedded crytopp as having
+# come from pycrypto.  We're not installing the embedded version.
+rm -rf %{buildroot}/%{_prefix}/cryptopp/extraversion.h
 
 %files
 %defattr(-,root,root,-)
@@ -57,8 +60,10 @@ rm -rf %{buildroot}%{python_sitearch}/%{name}/testvectors/
 %{python_sitearch}/%{name}
 %{python_sitearch}/%{name}-%{version}-*.egg-info
 
-
 %changelog
+* Tue Jul 27 2010 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.25-1
+- Update release at upstream's request.  The source code looks reasonably safe
+
 * Tue Jul 27 2010 Toshio Kuratomi <toshio at fedoraproject.org> 0.5.19-4
 - Bumping release so we can rebuild this in the py27 rebuild tag
 
diff --git a/sources b/sources
index 288e5bf..44f08c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3bc9fc3b4d6d815394881621cdeaab53  pycryptopp-0.5.19.tar.gz
+4c8666463d740ce6938b80d4bf4be791  pycryptopp-0.5.25.tar.gz