rpms/python-crypto/devel python-crypto-x86_64-buildfix.patch, NONE, 1.1 python-crypto.spec, 1.4, 1.5

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/python-crypto/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv30995/devel

Modified Files:
	python-crypto.spec 
Added Files:
	python-crypto-x86_64-buildfix.patch 
Log Message:
auto-import python-crypto-2.0-2 on branch devel from python-crypto-2.0-2.src.rpm

python-crypto-x86_64-buildfix.patch:

--- NEW FILE python-crypto-x86_64-buildfix.patch ---
--- setup.py.old	2004-12-18 12:52:44.031165688 +0100
+++ setup.py	2004-12-18 12:54:16.861053400 +0100
@@ -116,7 +116,7 @@
         build_ext.build_extensions(self)
 
     def detect_modules (self):
-        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
+        lib_dirs = self.compiler.library_dirs + ['/lib64', '/usr/lib64']
         inc_dirs = self.compiler.include_dirs + ['/usr/include']
         exts = []
         if (self.compiler.find_library_file(lib_dirs, 'gmp')):


Index: python-crypto.spec
===================================================================
RCS file: /cvs/extras/rpms/python-crypto/devel/python-crypto.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-crypto.spec	10 Dec 2004 22:03:10 -0000	1.4
+++ python-crypto.spec	18 Dec 2004 14:40:32 -0000	1.5
@@ -5,11 +5,12 @@
 Name: 		python-crypto
 Version: 	2.0
 Epoch:		0
-Release: 	1
+Release: 	2
 License: 	Python License (CNRI Python License)
 Group: 		Development/Libraries
 URL: 		http://www.amk.ca/python/code/crypto.html
 Source:		http://www.amk.ca/files/python/crypto/pycrypto-2.0.tar.gz
+Patch0:		%{name}-x86_64-buildfix.patch
 BuildRequires:	python >= 0:2.2
 BuildRequires:	python-devel >= 0:2.2
 BuildRequires:	gmp-devel >= 0:4.1
@@ -24,6 +25,9 @@
 # The pre section.
 %prep
 %setup -n pycrypto-2.0 -q 
+%ifarch x86_64
+%patch0 -b .patch0
+%endif 
 
 # The build section.
 %build
@@ -44,35 +48,39 @@
 %files 
 %defattr(-,root,root,-)
 %doc README TODO ACKS ChangeLog LICENSE Doc Demo
-%{python_sitelib}/Crypto/*.py
-%{python_sitelib}/Crypto/*.pyc
-%ghost %{python_sitelib}/Crypto/*.pyo
+%{python_sitearch}/Crypto/*.py
+%{python_sitearch}/Crypto/*.pyc
+%ghost %{python_sitearch}/Crypto/*.pyo
 %{python_sitearch}/Crypto/Cipher/*.so
-%{python_sitelib}/Crypto/Cipher/*.py
-%{python_sitelib}/Crypto/Cipher/*.pyc
-%ghost %{python_sitelib}/Crypto/Cipher/*.pyo
+%{python_sitearch}/Crypto/Cipher/*.py
+%{python_sitearch}/Crypto/Cipher/*.pyc
+%ghost %{python_sitearch}/Crypto/Cipher/*.pyo
 %{python_sitearch}/Crypto/Hash/*.so
-%{python_sitelib}/Crypto/Hash/*.py
-%{python_sitelib}/Crypto/Hash/*.pyc
-%ghost %{python_sitelib}/Crypto/Hash/*.pyo
-%{python_sitelib}/Crypto/Protocol/*.py
-%{python_sitelib}/Crypto/Protocol/*.pyc
-%ghost %{python_sitelib}/Crypto/Protocol/*.pyo
+%{python_sitearch}/Crypto/Hash/*.py
+%{python_sitearch}/Crypto/Hash/*.pyc
+%ghost %{python_sitearch}/Crypto/Hash/*.pyo
+%{python_sitearch}/Crypto/Protocol/*.py
+%{python_sitearch}/Crypto/Protocol/*.pyc
+%ghost %{python_sitearch}/Crypto/Protocol/*.pyo
 %{python_sitearch}/Crypto/PublicKey/*.so
-%{python_sitelib}/Crypto/PublicKey/*.py
-%{python_sitelib}/Crypto/PublicKey/*.pyc
-%ghost %{python_sitelib}/Crypto/PublicKey/*.pyo
-%{python_sitelib}/Crypto/Util/*.py
-%{python_sitelib}/Crypto/Util/*.pyc
-%ghost %{python_sitelib}/Crypto/Util/*.pyo
-%dir %{python_sitelib}/Crypto
-%dir %{python_sitelib}/Crypto/Cipher/
-%dir %{python_sitelib}/Crypto/Hash/
-%dir %{python_sitelib}/Crypto/Protocol/
-%dir %{python_sitelib}/Crypto/PublicKey/
-%dir %{python_sitelib}/Crypto/Util/
+%{python_sitearch}/Crypto/PublicKey/*.py
+%{python_sitearch}/Crypto/PublicKey/*.pyc
+%ghost %{python_sitearch}/Crypto/PublicKey/*.pyo
+%{python_sitearch}/Crypto/Util/*.py
+%{python_sitearch}/Crypto/Util/*.pyc
+%ghost %{python_sitearch}/Crypto/Util/*.pyo
+%dir %{python_sitearch}/Crypto
+%dir %{python_sitearch}/Crypto/Cipher/
+%dir %{python_sitearch}/Crypto/Hash/
+%dir %{python_sitearch}/Crypto/Protocol/
+%dir %{python_sitearch}/Crypto/PublicKey/
+%dir %{python_sitearch}/Crypto/Util/
 
 %changelog
+* Sat Dec 18 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:2.0-2
+- Fix build on x86_64: use python_sitearch for files and patch source
+  to find gmp 
+
 * Thu Aug 26 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:2.0-0.fdr.1
 - Update to 2.00