packages: python/python-lib64.patch, python/python.spec - rel 2; move more ...

[arekm]

Author: arekm                        Date: Tue Jul  6 06:43:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; move more files needed by python main pkg

---- Files affected:
packages/python:
   python-lib64.patch (1.19 -> 1.20) , python.spec (1.362 -> 1.363) 

---- Diffs:

================================================================
Index: packages/python/python-lib64.patch
diff -u packages/python/python-lib64.patch:1.19 packages/python/python-lib64.patch:1.20
--- packages/python/python-lib64.patch:1.19	Mon Jul  5 20:41:39 2010
+++ packages/python/python-lib64.patch	Tue Jul  6 08:43:42 2010
@@ -326,3 +326,53 @@
              self.assertEquals(dirs[1], wanted)
  
          # let's try the specific Apple location
+--- Python-2.7/Lib/sysconfig.py.org	2010-05-20 00:20:14.000000000 +0200
++++ Python-2.7/Lib/sysconfig.py	2010-07-06 08:31:15.687728628 +0200
+@@ -5,22 +5,24 @@
+ import os
+ from os.path import pardir, realpath
+ 
++libname = sys.lib
++
+ _INSTALL_SCHEMES = {
+     'posix_prefix': {
+-        'stdlib': '{base}/lib/python{py_version_short}',
+-        'platstdlib': '{platbase}/lib/python{py_version_short}',
+-        'purelib': '{base}/lib/python{py_version_short}/site-packages',
+-        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
++        'stdlib': '{base}/' + libname + '/python{py_version_short}',
++        'platstdlib': '{platbase}/' + libname + '/python{py_version_short}',
++        'purelib': '{base}/' + libname + '/python{py_version_short}/site-packages',
++        'platlib': '{platbase}/' + libname + '/python{py_version_short}/site-packages',
+         'include': '{base}/include/python{py_version_short}',
+         'platinclude': '{platbase}/include/python{py_version_short}',
+         'scripts': '{base}/bin',
+         'data': '{base}',
+         },
+     'posix_home': {
+-        'stdlib': '{base}/lib/python',
+-        'platstdlib': '{base}/lib/python',
+-        'purelib': '{base}/lib/python',
+-        'platlib': '{base}/lib/python',
++        'stdlib': '{base}/' + libname + '/python',
++        'platstdlib': '{base}/' + libname + '/python',
++        'purelib': '{base}/' + libname + '/python',
++        'platlib': '{base}/' + libname + '/python',
+         'include': '{base}/include/python',
+         'platinclude': '{base}/include/python',
+         'scripts': '{base}/bin',
+@@ -65,10 +67,10 @@
+         'data'   : '{userbase}',
+         },
+     'posix_user': {
+-        'stdlib': '{userbase}/lib/python{py_version_short}',
+-        'platstdlib': '{userbase}/lib/python{py_version_short}',
+-        'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
+-        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
++        'stdlib': '{userbase}/' + libname + '/python{py_version_short}',
++        'platstdlib': '{userbase}/' + libname + '/python{py_version_short}',
++        'purelib': '{userbase}/' + libname + '/python{py_version_short}/site-packages',
++        'platlib': '{userbase}/' + libname + '/python{py_version_short}/site-packages',
+         'include': '{userbase}/include/python{py_version_short}',
+         'scripts': '{userbase}/bin',
+         'data'   : '{userbase}',

================================================================
Index: packages/python/python.spec
diff -u packages/python/python.spec:1.362 packages/python/python.spec:1.363
--- packages/python/python.spec:1.362	Tue Jul  6 08:14:19 2010
+++ packages/python/python.spec	Tue Jul  6 08:43:42 2010
@@ -45,7 +45,7 @@
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python
 Version:	%{py_ver}
-Release:	1.3
+Release:	2
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
@@ -892,6 +892,12 @@
 %dir %{py_scriptdir}/encodings
 %{py_scriptdir}/encodings/*.py[co]
 
+# required by sysconfig.py
+%dir %{py_libdir}/config
+%{py_libdir}/config/Makefile
+%dir %{py_incdir}
+%{py_incdir}/pyconfig.h
+
 %files -n pydoc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pydoc
@@ -914,14 +920,12 @@
 %attr(755,root,root) %{__python}-config
 %attr(755,root,root) %{__python}%{py_ver}-config
 %attr(755,root,root) %{_libdir}/lib*.so
-%dir %{py_incdir}
 %{py_incdir}/*.h
+%exclude %{py_incdir}/pyconfig.h
 %{_pkgconfigdir}/*.pc
 
-%dir %{py_libdir}/config
 %attr(755,root,root) %{py_libdir}/config/makesetup
 %attr(755,root,root) %{py_libdir}/config/install-sh
-%{py_libdir}/config/Makefile
 %{py_libdir}/config/Makefile.pre.in
 %{py_libdir}/config/Setup
 %{py_libdir}/config/Setup.config
@@ -1017,6 +1021,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.363  2010/07/06 06:43:42  arekm
+- rel 2; move more files needed by python main pkg
+
 Revision 1.362  2010/07/06 06:14:19  arekm
 - moved some modules from -modules to main (required by main)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-lib64.patch?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python.spec?r1=1.362&r2=1.363&f=u