SOURCES: python-noarch_to_datadir.patch, python-lib64.patch - KISS

[tommat]

Author: tommat                       Date: Mon Mar 19 11:30:15 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- KISS

---- Files affected:
SOURCES:
   python-noarch_to_datadir.patch (1.8 -> 1.9) , python-lib64.patch (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/python-noarch_to_datadir.patch
diff -u SOURCES/python-noarch_to_datadir.patch:1.8 SOURCES/python-noarch_to_datadir.patch:1.9
--- SOURCES/python-noarch_to_datadir.patch:1.8	Sat Mar 17 17:39:35 2007
+++ SOURCES/python-noarch_to_datadir.patch	Mon Mar 19 12:30:10 2007
@@ -77,22 +77,11 @@
 diff -Nur Python-2.5.orig/Modules/getpath.c Python-2.5/Modules/getpath.c
 --- Python-2.5.orig/Modules/getpath.c	2007-03-17 16:26:13.807358000 +0000
 +++ Python-2.5/Modules/getpath.c	2007-03-17 16:26:50.825671500 +0000
-@@ -118,15 +118,16 @@
- 
- #ifndef LIB_PYTHON
- #if defined(__x86_64__)
--#define LIB_PYTHON "lib64/python" VERSION
-+#define LIB_PYTHON "lib64/python"
- #else
--#define LIB_PYTHON "lib/python" VERSION
-+#define LIB_PYTHON "lib/python"
- #endif
- #endif
+@@ -126,7 +126,8 @@
  
  #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
--              EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
-+#define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
+ #define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
+-              EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:"
 +              EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:" \
 +              PREFIX "/share/python" VERSION
  #endif
@@ -102,8 +91,7 @@
  static char exec_prefix[MAXPATHLEN+1];
  static char progpath[MAXPATHLEN+1];
  static char *module_search_path = NULL;
--static char lib_python[] = LIB_PYTHON;
-+static char lib_python[] = LIB_PYTHON VERSION;
+ static char lib_python[] = LIB_PYTHON VERSION;
 +static char share_python[] = "share/python" VERSION;
  
  static void

================================================================
Index: SOURCES/python-lib64.patch
diff -u SOURCES/python-lib64.patch:1.14 SOURCES/python-lib64.patch:1.15
--- SOURCES/python-lib64.patch:1.14	Thu Aug 24 17:01:01 2006
+++ SOURCES/python-lib64.patch	Mon Mar 19 12:30:10 2007
@@ -192,17 +192,17 @@
  
 +#ifndef LIB_PYTHON
 +#if defined(__x86_64__)
-+#define LIB_PYTHON "lib64/python" VERSION
++#define LIB_PYTHON "lib64/python"
 +#else
-+#define LIB_PYTHON "lib/python" VERSION
++#define LIB_PYTHON "lib/python"
 +#endif
 +#endif
 +
  #ifndef PYTHONPATH
 -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
 -              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
-+              EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
++#define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
++              EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:"
  #endif
  
  #ifndef LANDMARK
@@ -211,7 +211,7 @@
  static char progpath[MAXPATHLEN+1];
  static char *module_search_path = NULL;
 -static char lib_python[] = "lib/python" VERSION;
-+static char lib_python[] = LIB_PYTHON;
++static char lib_python[] = LIB_PYTHON VERSION;
  
  static void
  reduce(char *dir)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/python-noarch_to_datadir.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SOURCES/python-lib64.patch?r1=1.14&r2=1.15&f=u