[python3] - on 64bit "stdlib" was still "/usr/lib/python*" (modify *lib64.patch) - make find-provides-without-
tomspur
tomspur at fedoraproject.org
Sun Aug 22 12:41:21 UTC 2010
commit 997d5a24f2ed0138ce205d7709f5a6acb52fd531
Author: Thomas Spura <tomspur at fedoraproject.org>
Date: Sun Aug 22 14:40:58 2010 +0200
- on 64bit "stdlib" was still "/usr/lib/python*" (modify *lib64.patch)
- make find-provides-without-python-sonames.sh 64bit aware
find-provides-without-python-sonames.sh | 5 +++--
python-3.2a1-lib64.patch | 19 +++++++++++++++++++
python3.spec | 4 ++++
3 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/find-provides-without-python-sonames.sh b/find-provides-without-python-sonames.sh
index 406a675..8961b87 100755
--- a/find-provides-without-python-sonames.sh
+++ b/find-provides-without-python-sonames.sh
@@ -9,6 +9,7 @@
# So we strip out all /usr/lib/python lines first, before running them through
# the standard script:
-grep -v "/usr/lib/python" | /usr/lib/rpm/find-provides
+grep -v "/usr/lib/python" | grep -v "/usr/lib64/python" | \
+ /usr/lib/rpm/find-provides
-exit 0
\ No newline at end of file
+exit 0
diff --git a/python-3.2a1-lib64.patch b/python-3.2a1-lib64.patch
index d778b5a..df7eb68 100644
--- a/python-3.2a1-lib64.patch
+++ b/python-3.2a1-lib64.patch
@@ -144,3 +144,22 @@ diff -up Python-3.2a1/Modules/getpath.c.lib64 Python-3.2a1/Modules/getpath.c
] )
if (ssl_incs is not None and
+Index: Lib/sysconfig.py
+===================================================================
+--- Lib/sysconfig.py
++++ Lib/sysconfig.py 2010-08-22 14:34:38.791426924 +0200
+@@ -11,10 +11,10 @@
+
+ _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}/lib64/python{py_version_short}',
++ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
++ 'purelib': '{base}/lib64/python{py_version_short}/site-packages',
++ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
+ 'include': '{base}/include/python{py_version_short}',
+ 'platinclude': '{platbase}/include/python{py_version_short}',
+ 'scripts': '{base}/bin',
diff --git a/python3.spec b/python3.spec
index 15a8549..381333a 100644
--- a/python3.spec
+++ b/python3.spec
@@ -1161,6 +1161,10 @@ rm -fr %{buildroot}
%changelog
+* Sun Aug 22 2010 Thomas Spura <tomspur at fedoraproject.org> - 3.2-0.1.a1
+- on 64bit "stdlib" was still "/usr/lib/python*" (modify *lib64.patch)
+- make find-provides-without-python-sonames.sh 64bit aware
+
* Sat Aug 21 2010 David Malcolm <dmalcolm at redhat.com> - 3.2-0.0.a1
- 3.2a1; add alphatag
- rework %%files in the light of PEP 3147 (__pycache__)
More information about the scm-commits
mailing list