[python/f17] 2.7.3-7.1: use rpm macro for power64 (rhbz#834653)
dmalcolm
dmalcolm at fedoraproject.org
Fri Jun 22 17:39:12 UTC 2012
commit b6f7740eb05c414d1051dd3944649180bd3e0bd9
Author: David Malcolm <dmalcolm at redhat.com>
Date: Fri Jun 22 13:30:17 2012 -0400
2.7.3-7.1: use rpm macro for power64 (rhbz#834653)
python.spec | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/python.spec b/python.spec
index b8a50d8..b6fc2bc 100644
--- a/python.spec
+++ b/python.spec
@@ -47,7 +47,7 @@
%global with_systemtap 1
# some arches don't have valgrind so we need to disable its support on them
-%ifarch %{ix86} x86_64 ppc ppc64 s390x
+%ifarch %{ix86} x86_64 ppc %{power64} s390x
%global with_valgrind 1
%else
%global with_valgrind 0
@@ -108,7 +108,9 @@ Summary: An interpreted, interactive, object-oriented programming language
Name: %{python}
# Remember to also rebase python-docs when changing this:
Version: 2.7.3
-Release: 7%{?dist}
+# For Fedora 17 maintenance, keep the "Release" of the form 7.n so that
+# it is < that of Fedora 18:
+Release: 7.1%{?dist}
License: Python
Group: Development/Languages
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@ -954,7 +956,7 @@ done
%patch130 -p1
-%ifarch ppc ppc64
+%ifarch ppc %{power64}
%patch131 -p1
%endif
@@ -1112,7 +1114,7 @@ LD_LIBRARY_PATH="$topdir/$ConfDir" PATH=$PATH:$topdir/$ConfDir make -s EXTRA_CFL
BuildPython debug \
python-debug \
python%{pybasever}-debug \
-%ifarch %{ix86} x86_64 ppc ppc64
+%ifarch %{ix86} x86_64 ppc %{power64}
"--with-pydebug --with-tsc --with-count-allocs --with-call-profile" \
%else
"--with-pydebug --with-count-allocs --with-call-profile" \
@@ -1310,7 +1312,7 @@ install -d %{buildroot}/usr/lib/python%{pybasever}/site-packages
%global _pyconfig32_h pyconfig-32.h
%global _pyconfig64_h pyconfig-64.h
-%ifarch ppc64 s390x x86_64 ia64 alpha sparc64
+%ifarch %{power64} s390x x86_64 ia64 alpha sparc64
%global _pyconfig_h %{_pyconfig64_h}
%else
%global _pyconfig_h %{_pyconfig32_h}
@@ -1383,7 +1385,7 @@ done
# Install a tapset for this libpython into tapsetdir, fixing up the path to the
# library:
mkdir -p %{buildroot}%{tapsetdir}
-%ifarch ppc64 s390x x86_64 ia64 alpha sparc64
+%ifarch %{power64} s390x x86_64 ia64 alpha sparc64
%global libpython_stp_optimized libpython%{pybasever}-64.stp
%global libpython_stp_debug libpython%{pybasever}-debug-64.stp
%else
@@ -1819,6 +1821,9 @@ rm -fr %{buildroot}
# ======================================================
%changelog
+* Fri Jun 22 2012 David Malcolm <dmalcolm at redhat.com> - 2.7.3-7.1
+- use rpm macro for power64 (rhbz#834653)
+
* Fri May 4 2012 David Malcolm <dmalcolm at redhat.com> - 2.7.3-7
- renumber autotools patch from 300 to 5000
- specfile cleanups
More information about the scm-commits
mailing list