[PyQwt/f15] reverted the use of %{?_isa} for arch specific Requires as they cause dependancy problems on x86_64

Tadej Janež tadej at fedoraproject.org
Tue Jan 3 13:08:54 UTC 2012


commit 88cf71ad272405da8cda7c3a60d737da3997c7a4
Author: Tadej Janež <tadej.janez at tadej.hicsalta.si>
Date:   Tue Jan 3 14:08:29 2012 +0100

    reverted the use of %{?_isa} for arch specific Requires as they cause
    dependancy problems on x86_64 architecuture

 PyQwt.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/PyQwt.spec b/PyQwt.spec
index 52faa4f..bcba02b 100644
--- a/PyQwt.spec
+++ b/PyQwt.spec
@@ -1,6 +1,6 @@
 Name:           PyQwt
 Version:        5.2.0
-Release:        14%{?dist}
+Release:        14%{?dist}.1
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -15,8 +15,8 @@ BuildRequires:  PyQt4-devel
 BuildRequires:  numpy-f2py
 BuildRequires:  qwt-devel
 
-Requires:       PyQt4%{?_isa}
-Requires:       numpy%{?_isa}
+Requires:       PyQt4
+Requires:       numpy
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
 # prevent rpm's auto-generated provides mechanism to include PyQwt's private
@@ -35,9 +35,9 @@ control bounded or unbounded floating point values.
 %package devel
 Summary: Files needed to build other bindings on PyQwt
 Group:   Development/Languages
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: PyQt4-devel%{?_isa}
-Requires: qwt-devel%{?_isa}
+Requires: %{name} = %{version}-%{release}
+Requires: PyQt4-devel
+Requires: qwt-devel
 %description devel
 Files needed to build other bindings for Qwt C++ classes that inherit from
 any of the PyQwt classes.
@@ -86,6 +86,10 @@ chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/qplt.py
 
 
 %changelog
+* Tue Jan 03 2012 Tadej Janež <tadej.janez at tadej.hicsalta.si> - 5.2.0-14.1
+- reverted the use of %%{?_isa} for arch specific Requires as they cause
+  dependancy problems on x86_64 architecuture
+
 * Wed Sep 07 2011 Tadej Janež <tadej.janez at tadej.hicsalta.si> - 5.2.0-14
 - changes to the spec file that follow the latest Packaging Guidelines:
   - added %%{?_isa} to arch specific Requires


More information about the scm-commits mailing list