SPECS: python.spec - use dynamic sys.lib patch. now possible to ...

[glen]

Author: glen                         Date: Thu Jan 26 00:06:31 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use dynamic sys.lib patch.
  now possible to have -libs package from athlon and amd64 while searchpath stays correct

---- Files affected:
SPECS:
   python.spec (1.248 -> 1.249) 

---- Diffs:

================================================================
Index: SPECS/python.spec
diff -u SPECS/python.spec:1.248 SPECS/python.spec:1.249
--- SPECS/python.spec:1.248	Thu Jan 26 00:49:42 2006
+++ SPECS/python.spec	Thu Jan 26 01:06:26 2006
@@ -1,4 +1,10 @@
 # $Revision$, $Date$
+# TODO
+# - test_distutils fails for unknown reason: (does it still do with new lib64 patch?)
+#   AssertionError: '/tmp/tmpaomC0l/installation/share/python' != '/tmp/tmpaomC0l/installation/lib/python'
+# - change searchpath order so /usr/lib* is before /usr/share
+# - kill lib-tk from searchpath
+# - kill BR: file requirement from lib64 patch
 #
 # Conditional build:
 %bcond_without	tkinter			# disables tkinter module building
@@ -11,8 +17,6 @@
 %define		nobuilder_tests test_resource test_openpty test_socket test_nis test_posix test_locale test_pty
 # tests which fail because of some unknown/unresolved reason (this list should be empty)
 %define		broken_tests test_anydbm test_bsddb test_re test_shelve test_whichdb test_zipimport test_distutils
-# test_distutils fails for unknown reason:
-# AssertionError: '/tmp/tmpaomC0l/installation/share/python' != '/tmp/tmpaomC0l/installation/lib/python'
 
 %define py_ver		2.4
 %define py_prefix	%{_prefix}
@@ -31,7 +35,7 @@
 Summary(uk):	íĎ×Á ĐŇĎÇŇÁÍŐ×ÁÎÎŃ ÄŐÖĹ ×ÉÓĎËĎÇĎ ŇŚ×ÎŃ Ú X-ŚÎÔĹŇĆĹĘÓĎÍ
 Name:		python
 Version:	%{py_ver}.2
-Release:	3
+Release:	3.5
 Epoch:		1
 License:	PSF
 Group:		Applications
@@ -53,6 +57,7 @@
 BuildRequires:	bzip2-devel
 BuildRequires:	db-devel >= 4
 BuildRequires:	expat-devel >= 1:1.95.7
+BuildRequires:	file
 BuildRequires:	gdbm-devel >= 1.8.3
 BuildRequires:	gmp-devel >= 4.0
 BuildRequires:	libstdc++-devel
@@ -476,10 +481,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%if "%{_lib}" == "lib64"
 %patch5 -p1
-%endif
+%patch4 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -575,6 +578,7 @@
 %exclude %{py_scriptdir}/timeit.py[co]
 %exclude %{py_scriptdir}/os.py[co]
 %exclude %{py_scriptdir}/encodings/*.py[co]
+%exclude %{py_scriptdir}/types.py[co]
 
 %{py_scriptdir}/*.py[co]
 
@@ -709,6 +713,8 @@
 %{py_scriptdir}/site.py[co]
 %{py_scriptdir}/stat.py[co]
 %{py_scriptdir}/os.py[co]
+# needed by the dynamic sys.lib patch
+%{py_scriptdir}/types.py[co]
 
 # encodings required by python library
 %dir %{py_scriptdir}/encodings
@@ -815,6 +821,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.249  2006/01/26 00:06:26  glen
+- use dynamic sys.lib patch.
+  now possible to have -libs package from athlon and amd64 while searchpath stays correct
+
 Revision 1.248  2006/01/25 23:49:42  glen
 - regen unuseful to package
 
================================================================

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