From 24d65d487867c19703ed2cd40444a784e0408e75 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Jun 04 2007 15:27:44 +0000 Subject: fix ppc64 build --- diff --git a/python-crypto-x86_64-buildfix.patch b/python-crypto-x86_64-buildfix.patch deleted file mode 100644 index 2878fe4..0000000 --- a/python-crypto-x86_64-buildfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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')): diff --git a/python-crypto.spec b/python-crypto.spec index be02353..31b9c23 100644 --- a/python-crypto.spec +++ b/python-crypto.spec @@ -4,12 +4,11 @@ Summary: Cryptography library for Python Name: python-crypto Version: 2.0.1 -Release: 7 +Release: 7.1%{?dist} 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.1.tar.gz -Patch0: %{name}-x86_64-buildfix.patch BuildRequires: python >= 2.2 BuildRequires: python-devel >= 2.2 BuildRequires: gmp-devel >= 4.1 @@ -24,9 +23,7 @@ etc.). %prep %setup -n pycrypto-%{version} -q -%ifarch x86_64 -%patch0 -b .patch0 -%endif +sed -i s:/lib:/%_lib:g setup.py %build @@ -64,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 04 2007 David Woodhouse - 2.0.1-7.1 +- Fix libdir handling so it works on more arches than x86_64 + * Wed Apr 18 2007 Thorsten Leemhuis - 2.0.1-7 - Fix typo