SPECS: python.spec - bcond for old openssl

arekm arekm at pld-linux.org
Sun Jan 21 19:57:57 CET 2007


Author: arekm                        Date: Sun Jan 21 18:57:56 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond for old openssl

---- Files affected:
SPECS:
   python.spec (1.289 -> 1.290) 

---- Diffs:

================================================================
Index: SPECS/python.spec
diff -u SPECS/python.spec:1.289 SPECS/python.spec:1.290
--- SPECS/python.spec:1.289	Sat Jan 13 14:03:29 2007
+++ SPECS/python.spec	Sun Jan 21 19:57:49 2007
@@ -12,6 +12,7 @@
 %bcond_without	tkinter			# disables tkinter module building
 %bcond_without	tests			# disables Python testing
 %bcond_with	verbose_tests		# runs tests in verbose mode
+%bcond_with	openssl097
 #
 # tests which will not work on 64-bit platforms
 %define		no64bit_tests	test_audioop test_rgbimg test_imageop
@@ -71,7 +72,11 @@
 BuildRequires:	gmp-devel >= 4.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-ext-devel >= 5.2
+%if %{with openssl097}
+BuildRequires:	openssl-devel < 0.9.8
+%else
 BuildRequires:	openssl-devel >= 0.9.8
+%endif
 BuildRequires:	readline-devel >= 5.0
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
@@ -536,6 +541,8 @@
 %{__make} \
 	OPT="%{rpmcflags}"
 
+find . -name '*failed*'
+
 LC_ALL=C
 export LC_ALL
 %if %{with tests}
@@ -705,6 +712,7 @@
 %attr(755,root,root) %{py_dyndir}/_lsprof.so
 %attr(755,root,root) %{py_dyndir}/_multibytecodec.so
 %attr(755,root,root) %{py_dyndir}/_random.so
+%{?with_openssl097:%attr(755,root,root) %{py_dyndir}/_sha*.so}
 %attr(755,root,root) %{py_dyndir}/_socket.so
 %attr(755,root,root) %{py_dyndir}/_ssl.so
 %attr(755,root,root) %{py_dyndir}/_testcapi.so
@@ -921,6 +929,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.290  2007/01/21 18:57:49  arekm
+- bcond for old openssl
+
 Revision 1.289  2007/01/13 13:03:29  qboosh
 - O: python-cElementTree too (included as _elementtree.so)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/python.spec?r1=1.289&r2=1.290&f=u



More information about the pld-cvs-commit mailing list