- up to 2.7.3; include py files

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

diff --git a/python-lib64.patch b/python-lib64.patch
index 925433fe2aee33ee6232c068edc6e9ef312aeac4..921b6466f47f271f0e17f09b0e81a051b5ba7b4d 100644 (file)
--- a/python-lib64.patch
+++ b/python-lib64.patch
@@ -104,14 +104,6 @@ diff -Nur Python-2.5b2.orig/Lib/distutils/sysconfig.py Python-2.5b2/Lib/distutil
 diff -Nur Python-2.5b2.orig/Lib/distutils/tests/test_install.py Python-2.5b2/Lib/distutils/tests/test_install.py
 --- Python-2.5b2.orig/Lib/distutils/tests/test_install.py      2004-06-26 00:02:59.000000000 +0100
 +++ Python-2.5b2/Lib/distutils/tests/test_install.py   2006-07-12 17:42:51.000000000 +0100
-@@ -1,6 +1,6 @@
- """Tests for distutils.command.install."""
- 
--import os
-+import os,sys
- import unittest
- 
- from distutils.command.install import install
 @@ -39,8 +39,9 @@
              self.assertEqual(got, expected)
  
@@ -302,14 +294,18 @@ diff -Nur Python-2.5b2.orig/setup.py Python-2.5b2/setup.py
              added_lib_dirs.append('/usr/X11R5/lib')
 --- Python-2.7/Lib/test/test_site.py~  2010-05-14 01:59:41.000000000 +0200
 +++ Python-2.7/Lib/test/test_site.py   2010-07-05 20:36:37.311186935 +0200
-@@ -166,19 +166,19 @@
+@@ -226,7 +226,7 @@
  
          if sys.platform in ('os2emx', 'riscos'):
              self.assertEqual(len(dirs), 1)
 -            wanted = os.path.join('xoxo', 'Lib', 'site-packages')
 +            wanted = os.path.join('xoxo', sys.lib, 'site-packages')
              self.assertEqual(dirs[0], wanted)
+         elif (sys.platform == "darwin" and
+             sysconfig.get_config_var("PYTHONFRAMEWORK")):
+@@ -242,16 +242,16 @@
          elif os.sep == '/':
+             # OS X non-framwework builds, Linux, FreeBSD, etc
              self.assertEqual(len(dirs), 2)
 -            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
 +            wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
@@ -319,13 +315,14 @@ diff -Nur Python-2.5b2.orig/setup.py Python-2.5b2/setup.py
 +            wanted = os.path.join('xoxo', sys.lib, 'site-python')
              self.assertEqual(dirs[1], wanted)
          else:
+             # other platforms
              self.assertEqual(len(dirs), 2)
              self.assertEqual(dirs[0], 'xoxo')
 -            wanted = os.path.join('xoxo', 'lib', 'site-packages')
 +            wanted = os.path.join('xoxo', sys.lib, 'site-packages')
              self.assertEqual(dirs[1], wanted)
  
-         # let's try the specific Apple location
+ class PthFile(object):
 --- 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 @@