[packages/python3/AC-branch: 2/2] Merge branch 'master' into AC-branch

[glen]

commit acf8c4fe998839df5cd134a827e7228a258abb7e
Merge: 6715902 f428224
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jul 28 10:52:16 2012 +0300

    Merge branch 'master' into AC-branch

 python3.spec | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
---
diff --cc python3.spec
index f903e98,9596987..bd178c3
--- a/python3.spec
+++ b/python3.spec
@@@ -450,8 -450,22 +450,22 @@@ Przykłady te są dla Pythona 2.3.4, ni
  %patch5 -p1
  %patch6 -p1
  
+ %{__rm} -r Modules/zlib
+ 
+ for SUBDIR in darwin libffi libffi_arm_wince libffi_msvc libffi_osx; do
+ 	%{__rm} -r Modules/_ctypes/$SUBDIR
+ done
+ 
+ files="md5module.c sha1module.c"
+ %if !0%(pkg-config  openssl --atleast-version=0.9.8; echo $?)
+ files="$files sha256module.c sha512module.c"
+ %endif
+ for f in $files; do
+ 	%{__rm} Modules/$f
+ done
+ 
  %build
 -if ! grep -q "tmpfs" /proc/self/mounts; then
 +if false && ! grep -q "tmpfs" /proc/self/mounts; then
  	echo "You need to have /dev/shm mounted in order to build this package!" >&2
  	echo "(Or any other tmpfs mounted and accessible to the rpmbuild process)" >&2
  	exit 1