[python3/f20] Fix multilib dependencies. Rename python3.Xm-config script to arch specific. Resolves: rhbz#1091815
Miro Hrončok
churchyard at fedoraproject.org
Thu May 29 08:24:41 UTC 2014
commit 71a2caf4ecb01324f3e9a4c8291937caf608849b
Author: Miro Hrončok <miro at hroncok.cz>
Date: Thu May 29 10:24:14 2014 +0200
Fix multilib dependencies.
Rename python3.Xm-config script to arch specific.
Resolves: rhbz#1091815
python3.spec | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/python3.spec b/python3.spec
index 59074ce..92bf603 100644
--- a/python3.spec
+++ b/python3.spec
@@ -126,7 +126,7 @@
Summary: Version 3 of the Python programming language aka Python 3000
Name: python3
Version: %{pybasever}.2
-Release: 11%{?dist}
+Release: 12%{?dist}
License: Python
Group: Development/Languages
@@ -704,7 +704,8 @@ This package contains files used to embed Python 3 into applications.
%package devel
Summary: Libraries and header files needed for Python 3 development
Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Conflicts: %{name} < %{version}-%{release}
%description devel
@@ -1318,6 +1319,12 @@ sed \
%endif # with_systemtap
+# Rename the script that differs on different arches to arch specific name
+mv %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-{,%{_arch}-}config
+echo -e '#!/bin/sh\nexec `dirname $0`/python%{LDVERSION_optimized}-`uname -m`-config' > \
+ %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
+ chmod +x %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
+
# ======================================================
# Running the upstream test suite
# ======================================================
@@ -1590,6 +1597,7 @@ rm -fr %{buildroot}
%{_bindir}/python3-config
%{_bindir}/python%{pybasever}-config
%{_bindir}/python%{LDVERSION_optimized}-config
+%{_bindir}/python%{LDVERSION_optimized}-%{_arch}-config
%{_libdir}/libpython%{LDVERSION_optimized}.so
%{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
%{_libdir}/pkgconfig/python-%{pybasever}.pc
@@ -1755,6 +1763,11 @@ rm -fr %{buildroot}
# ======================================================
%changelog
+* Thu May 29 2014 Miro Hrončok <mhroncok at redhat.com> - 3.3.2-12
+- Fix multilib dependencies.
+- Rename python3.Xm-config script to arch specific.
+Resolves: rhbz#1091815
+
* Wed Mar 05 2014 Bohuslav Kabrda <bkabrda at redhat.com> - 3.3.2-11
- Fix loading of pyc files by ModuleFinder.load_module.
Resolves: rhbz#1060338
More information about the scm-commits
mailing list