Merge branch 'master' into AC-branch

diff --combined python3.spec
index 745168dd0f232ebbe17abd170fd727d9c9df4ecd,4683317591e90cd4e9798f166e105d126b8c607e..348897ef42f64fe6b23fa9bc98026e13c537c7ea
--- 1/python3.spec
--- 2/python3.spec
+++ b/python3.spec
@@@ -451,7 -451,7 +451,7 @@@ Przykłady te są dla Pythona 2.3.4, ni
  %patch6 -p1
  
  %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
@@@ -964,6 -964,13 +964,13 @@@ rm -rf $RPM_BUILD_ROO
  %attr(755,root,root) %{py_dyndir}/_socket.cpython-*.so
  %attr(755,root,root) %{py_dyndir}/_ssl.cpython-*.so
  %attr(755,root,root) %{py_dyndir}/_testcapi.cpython-*.so
+ 
+ # for openssl < 0.9.8 package sha256 and sha512 modules
+ %if 0%(pkg-config  openssl --atleast-version=0.9.8; echo $?)
+ %attr(755,root,root) %{py_dyndir}/_sha256.cpython-*.so
+ %attr(755,root,root) %{py_dyndir}/_sha512.cpython-*.so
+ %endif
+ 
  %attr(755,root,root) %{py_dyndir}/array.cpython-*.so
  %attr(755,root,root) %{py_dyndir}/atexit.cpython-*.so
  %attr(755,root,root) %{py_dyndir}/audioop.cpython-*.so