[python3] Back to Bash wrapper, as upstream in 3.4 also uses Bash for some reasons
Miro Hrončok
churchyard at fedoraproject.org
Tue Jul 1 10:18:34 UTC 2014
commit 8430e60b7bf430abf5981c28da74ad999ec8ddda
Author: Miro Hrončok <miro at hroncok.cz>
Date: Tue Jul 1 12:14:53 2014 +0200
Back to Bash wrapper, as upstream in 3.4 also uses Bash for some reasons
This reverts commit 95a55939d74997721acfb6e9b190a815c3e41fc1.
This reverts commit 41a68301c70978d906d1b08d4aaa85337d1de3fc.
config.py | 11 -----------
python3.spec | 15 ++++++---------
2 files changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/python3.spec b/python3.spec
index e956ab5..2596e4f 100644
--- a/python3.spec
+++ b/python3.spec
@@ -140,7 +140,7 @@
Summary: Version 3 of the Python programming language aka Python 3000
Name: python3
Version: %{pybasever}.1
-Release: 13%{?dist}
+Release: 12%{?dist}
License: Python
Group: Development/Languages
@@ -243,9 +243,6 @@ Source7: pyfuntop.stp
# Written by bkabrda
Source8: check-pyc-and-pyo-timestamps.py
-# Python wrapper arounf pythonXXm-config to be able to keep python3-devel multiarch
-Source9: config.py
-
# Fixup distutils/unixccompiler.py to remove standard library path from rpath:
# Was Patch0 in ivazquez' python3000 specfile:
Patch1: Python-3.1.1-rpath.patch
@@ -1384,8 +1381,11 @@ sed \
# Rename the script that differs on different arches to arch specific name
mv %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-{,`uname -m`-}config
-cp %{SOURCE9} %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
-chmod +x %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
+echo -e '#!/bin/sh\nexec `dirname $0`/python%{LDVERSION_optimized}-`uname -m`-config "$@"' > \
+ %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
+echo '[ $? -eq 127 ] && echo "Could not find python%{LDVERSION_optimized}-`uname -m`-config. Look around to see available arches." >&2' >> \
+ %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
+ chmod +x %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
# ======================================================
# Running the upstream test suite
@@ -1853,9 +1853,6 @@ rm -fr %{buildroot}
# ======================================================
%changelog
-* Mon Jun 30 2014 Miro Hrončok <mhroncok at redhat.com> - 3.4.1-13
-- Rewrite the config wrapper from Bash to Python, so it can be interpreted with Python
-
* Sun Jun 8 2014 Peter Robinson <pbrobinson at fedoraproject.org> 3.4.1-12
- aarch64 has valgrind, just list those that don't support it
More information about the scm-commits
mailing list