From: Elan Ruusamäe <glen@delfi.ee>
Date: Thu, 26 Jul 2012 10:41:14 +0000 (+0300)
Subject: Merge branch 'master' into AC-branch
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=a81833c8d564ccfe0a5bb66d2977c788f451319c;hp=-c;p=packages%2Fpython3.git

Merge branch 'master' into AC-branch
---

a81833c8d564ccfe0a5bb66d2977c788f451319c
diff --combined python3.spec
index 745168d,4683317..348897e
--- a/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