- up to 2.7.3; include py files

[packages/python.git] / python-noarch_to_datadir.patch

diff --git a/python-noarch_to_datadir.patch b/python-noarch_to_datadir.patch
index 0198a306694eca3da10e2997b23149f4a641afc0..be6a8f7a31288119029b80b7c056ae712e85a176 100644 (file)
--- a/python-noarch_to_datadir.patch
+++ b/python-noarch_to_datadir.patch
@@ -42,26 +42,24 @@ diff -Nur Python-2.5.orig/Lib/distutils/sysconfig.py Python-2.5/Lib/distutils/sy
 diff -Nur Python-2.5.orig/Lib/site.py Python-2.5/Lib/site.py
 --- Python-2.5.orig/Lib/site.py        2007-03-17 16:26:13.803357750 +0000
 +++ Python-2.5/Lib/site.py     2007-03-17 16:26:50.825671500 +0000
-@@ -185,13 +185,12 @@
-                                          sys.lib,
-                                          "python" + sys.version[:3],
-                                          "site-packages"),
--                            os.path.join(prefix, sys.lib, "site-python")]
--                if sys.lib != 'lib':
--                    sitedirs.append(os.path.join(prefix,
--                                                 'lib',
--                                                 "python" + sys.version[:3],
--                                                 "site-packages"))
--                    sitedirs.append(os.path.join(prefix, 'lib', "site-python"))
-+                            os.path.join(prefix, sys.lib, "site-python"),
-+                            os.path.join(prefix,
-+                                         "share",
-+                                         "python" + sys.version[:3],
-+                                         "site-packages"),
-+                            os.path.join(prefix, "share", "site-python")]
-             else:
-                 sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")]
-             if sys.platform == 'darwin':
+@@ -269,13 +269,10 @@
+                                         "python" + sys.version[:3],
+                                         "site-packages"))
+             sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
+-            if sys.lib != 'lib':
+-                sitepackages.append(os.path.join(prefix,
+-                    'lib',
+-                    "python" + sys.version[:3],
+-                    "site-packages"))
+-                sitepackages.append(os.path.join(prefix, 'lib', "site-python"))
+-
++            sitepackages.append(os.path.join(prefix, "share",
++                "python" + sys.version[:3],
++                "site-packages"))
++            sitepackages.append(os.path.join(prefix, "share", "site-python"))
+         else:
+             sitepackages.append(prefix)
+             sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
 diff -Nur Python-2.5.orig/Makefile.pre.in Python-2.5/Makefile.pre.in
 --- Python-2.5.orig/Makefile.pre.in    2007-03-17 16:26:13.807358000 +0000
 +++ Python-2.5/Makefile.pre.in 2007-03-17 16:26:50.821671250 +0000
@@ -138,6 +136,18 @@ diff -Nur Python-2.5.orig/Modules/getpath.c Python-2.5/Modules/getpath.c
          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];
+
+--- p/Lib/test/test_site.py~   2012-05-10 18:02:09.000000000 +0200
++++ p/Lib/test/test_site.py    2012-05-10 18:09:38.776569290 +0200
+@@ -241,7 +241,7 @@
+             self.assertEqual(dirs[2], wanted)
+         elif os.sep == '/':
+             # OS X non-framwework builds, Linux, FreeBSD, etc
+-            self.assertEqual(len(dirs), 2)
++            self.assertEqual(len(dirs), 4)
+             wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
+                                   'site-packages')
+             self.assertEqual(dirs[0], wanted)