[PyQwt] Changes to the spec file that follow the latest Packaging Guidelines: - added %{?_isa} to arch spec

[Tadej Janež]

commit 22e44e8f08521b3e138083eb7428029a8d2c4839
Author: Tadej Janež <tadej.janez at tadej.hicsalta.si>
Date:   Wed Sep 7 14:40:04 2011 +0200

    Changes to the spec file that follow the latest Packaging Guidelines:
     - added %{?_isa} to arch specific Requires
     - removed %defattr sections which are no longer necessary
    Removed an obsolete work-around which removed files conflicting with the
    PyQt4 package

 PyQwt.spec |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/PyQwt.spec b/PyQwt.spec
index f4eac07..52faa4f 100644
--- a/PyQwt.spec
+++ b/PyQwt.spec
@@ -1,6 +1,6 @@
 Name:           PyQwt
 Version:        5.2.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -15,8 +15,8 @@ BuildRequires:  PyQt4-devel
 BuildRequires:  numpy-f2py
 BuildRequires:  qwt-devel
 
-Requires:       PyQt4
-Requires:       numpy
+Requires:       PyQt4%{?_isa}
+Requires:       numpy%{?_isa}
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
 # prevent rpm's auto-generated provides mechanism to include PyQwt's private
@@ -36,8 +36,8 @@ control bounded or unbounded floating point values.
 Summary: Files needed to build other bindings on PyQwt
 Group:   Development/Languages
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: PyQt4-devel
-Requires: qwt-devel
+Requires: PyQt4-devel%{?_isa}
+Requires: qwt-devel%{?_isa}
 %description devel
 Files needed to build other bindings for Qwt C++ classes that inherit from
 any of the PyQwt classes.
@@ -58,6 +58,7 @@ popd
 
 make %{?_smp_mflags} -C configure
 
+
 %install
 make DESTDIR=%{buildroot} install -C configure
 # move the generated pdf and html documentation to devel-doc directory
@@ -70,25 +71,28 @@ mv sphinx/build/html devel-doc
 chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
 chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/qplt.py
 
-#FIXME!!! temporarily remove qwt.py* files which conflict with PyQt4 package
-rm -rf %{buildroot}/%{python_sitearch}/PyQt4/uic
-
 
 %files
-%defattr(-,root,root,-)
 %doc ANNOUNCEMENT-%{version} README
 %doc COPYING*
-%{python_sitearch}/PyQt4/*
+%{python_sitearch}/PyQt4/Qwt5/
+%{python_sitearch}/PyQt4/uic/widget-plugins/qwt.py*
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc devel-doc/*
 %doc qt4examples/ 
 %{_datadir}/sip/PyQt4/Qwt5/
 
 
 %changelog
+* 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
+  - removed %%defattr sections which are no longer necessary
+- removed an obsolete work-around which removed files conflicting with the
+  PyQt4 package
+
 * Tue Aug 09 2011 Rex Dieter <rdieter at fedoraproject.org> 5.2.0-13
 - .spec cosmetics
 - rebuild (qwt)