packages (PYTHON_2_6): python/python-lib64.patch, python/python-noarch_to_d...

hawk hawk at pld-linux.org
Wed Oct 12 19:27:01 CEST 2011


Author: hawk                         Date: Wed Oct 12 17:27:01 2011 GMT
Module: packages                      Tag: PYTHON_2_6
---- Log message:
- updated for 2.6.7

---- Files affected:
packages/python:
   python-lib64.patch (1.18 -> 1.18.2.1) , python-noarch_to_datadir.patch (1.10 -> 1.10.2.1) 

---- Diffs:

================================================================
Index: packages/python/python-lib64.patch
diff -u packages/python/python-lib64.patch:1.18 packages/python/python-lib64.patch:1.18.2.1
--- packages/python/python-lib64.patch:1.18	Fri Oct  3 10:13:47 2008
+++ packages/python/python-lib64.patch	Wed Oct 12 19:26:56 2011
@@ -162,12 +162,7 @@
  
  # Install prefix for architecture-independent files
  prefix=		@prefix@
-@@ -84,11 +86,11 @@
- 
- # Expanded directories
- BINDIR=		$(exec_prefix)/bin
--LIBDIR=		$(exec_prefix)/lib
-+LIBDIR=		$(exec_prefix)/$(LIB)
+@@ -84,7 +86,7 @@
  MANDIR=		@mandir@
  INCLUDEDIR=	@includedir@
  CONFINCLUDEDIR=	$(exec_prefix)/include
@@ -248,16 +243,16 @@
 --- Python-2.5b2.orig/Python/sysmodule.c	2006-07-10 22:08:24.000000000 +0100
 +++ Python-2.5b2/Python/sysmodule.c	2006-07-12 17:42:51.000000000 +0100
 @@ -1377,6 +1377,10 @@
- 			    PyString_FromString(Py_GetCopyright()));
- 	SET_SYS_FROM_STRING("platform",
- 			    PyString_FromString(Py_GetPlatform()));
-+	SET_SYS_FROM_STRING("arch",
-+			    PyString_FromString(Py_GetArch()));
-+	SET_SYS_FROM_STRING("lib",
-+			    PyString_FromString(Py_GetLib()));
- 	SET_SYS_FROM_STRING("executable",
- 			    PyString_FromString(Py_GetProgramFullPath()));
- 	SET_SYS_FROM_STRING("prefix",
+                         PyString_FromString(Py_GetCopyright()));
+     SET_SYS_FROM_STRING("platform",
+                         PyString_FromString(Py_GetPlatform()));
++    SET_SYS_FROM_STRING("arch",
++                        PyString_FromString(Py_GetArch()));
++    SET_SYS_FROM_STRING("lib",
++                        PyString_FromString(Py_GetLib()));
+     SET_SYS_FROM_STRING("executable",
+                         PyString_FromString(Py_GetProgramFullPath()));
+     SET_SYS_FROM_STRING("prefix",
 diff -Nur Python-2.5b2.orig/setup.py Python-2.5b2/setup.py
 --- Python-2.5b2.orig/setup.py	2006-06-30 07:18:39.000000000 +0100
 +++ Python-2.5b2/setup.py	2006-07-12 17:45:14.000000000 +0100

================================================================
Index: packages/python/python-noarch_to_datadir.patch
diff -u packages/python/python-noarch_to_datadir.patch:1.10 packages/python/python-noarch_to_datadir.patch:1.10.2.1
--- packages/python/python-noarch_to_datadir.patch:1.10	Fri Oct  3 10:13:48 2008
+++ packages/python/python-noarch_to_datadir.patch	Wed Oct 12 19:26:56 2011
@@ -136,6 +136,6 @@
          strncpy(zip_path, PREFIX, MAXPATHLEN);
 -    joinpath(zip_path, "lib/python00.zip");
 +    joinpath(zip_path, LIB_PYTHON "00.zip");
-     bufsz = strlen(zip_path);	/* Replace "00" with version */
+     bufsz = strlen(zip_path);   /* Replace "00" with version */
      zip_path[bufsz - 6] = VERSION[0];
      zip_path[bufsz - 5] = VERSION[2];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-lib64.patch?r1=1.18&r2=1.18.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-noarch_to_datadir.patch?r1=1.10&r2=1.10.2.1&f=u



More information about the pld-cvs-commit mailing list