Merge branch 'master' into AC-branch

diff --cc python3.spec
index f903e98d583b9b552080e01a3e29a23c7e74d138,95969872fe3d65131fef487226bf36bcd5a4d20d..bd178c3c613e56461753ac32f50c3c885e0007ee
--- 1/python3.spec
--- 2/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