[pycryptopp/f12/master: 10/10] Merge branch 'master' into f12 Update to a new release at upstream's behest. Conflicts: .gitignore

[Toshio くらとみ]

commit c231200cc20de0d6e2bd8b681631409d780cb8c6
Merge: 9033214 7a19155
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Sep 23 17:47:55 2010 -0400

    Merge branch 'master' into f12
    Update to a new release at upstream's behest.
    Conflicts:
    	.gitignore
    	pycryptopp.spec
    	sources

 .gitignore                |    2 +-
 pycryptopp-unbundle.patch |   58 +++++++++++++++++++++++++++++++++++++++++++++
 pycryptopp.spec           |   38 ++++++++++++++++++++++++-----
 sources                   |    2 +-
 4 files changed, 91 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index f2098b4,65b629a..c229ff0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- pycryptopp-0.5.17.tar.gz
 -pycryptopp-0.5.19.tar.gz
 -/pycryptopp-0.5.25.tar.gz
++pycryptopp-0.5.25.tar.gz
diff --cc pycryptopp.spec
index 637e76f,3f627bf..3050d98
--- a/pycryptopp.spec
+++ b/pycryptopp.spec
@@@ -39,15 -39,10 +39,21 @@@ CFLAGS="%{optflags}" %{__python} setup.
  
  
  %install
 +rm -rf %{buildroot}
- %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+ %{__python} setup.py install --skip-build --root %{buildroot}
  rm -rf %{buildroot}%{_docdir}/%{name}/
  
++# 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
++
 +
 + 
 +%clean
 +rm -rf %{buildroot}
 +
++
+ 
  %check
  CFLAGS="%{optflags}" %{__python} setup.py test
  
@@@ -55,14 -50,36 +61,32 @@@
  rm -rf %{buildroot}%{python_sitearch}/%{name}/test/
  rm -rf %{buildroot}%{python_sitearch}/%{name}/testvectors/
  
  %files
  %defattr(-,root,root,-)
  %doc COPYING.GPL COPYING.TGPPL.html README.txt ChangeLog copyright
 -%{python_sitearch}/%{name}
 -%{python_sitearch}/%{name}-%{version}-*.egg-info
 +%{python_sitearch}/*
 +
  
  %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
+ 
+ * 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
+ 
+ * Thu Jun 24 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.19-1
+ - Upstream released new version
+ 
+ * Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.17-5
+ - Rebuild for new cryptopp
+ 
  * Mon Nov 16 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.5.17-4
  - Initial import into devel