[PyQwt] - changes to the spec file that follow the latest Packaging Guidelines: - removed BuildRoot tag

[Tadej Janež]

commit 33f9d75d7ecf35ba050be451cef455a5b7c78258
Author: Tadej Janež <tadej.janez at tadej.hicsalta.si>
Date:   Mon Jan 3 18:05:32 2011 +0100

    - changes to the spec file that follow the latest Packaging Guidelines:
      - removed BuildRoot tag
      - removed %clean section
    - removed private shared object provides that were reported by rpmlint
    - removed the manual definition of the python_sitearch macro
    - simplified the handling of devel documentation files
    - minor cosmetic cleanups

 PyQwt.spec |   44 ++++++++++++++++++++++++++++++--------------
 1 files changed, 30 insertions(+), 14 deletions(-)
---
diff --git a/PyQwt.spec b/PyQwt.spec
index cb049f5..8e140fd 100644
--- a/PyQwt.spec
+++ b/PyQwt.spec
@@ -1,8 +1,6 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Name:           PyQwt
 Version:        5.2.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -10,9 +8,8 @@ Group:          Development/Languages
 License:        GPLv2+ with exceptions
 URL:            http://pyqwt.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pyqwt/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 BuildRequires:  sip-devel
 BuildRequires:  PyQt4-devel
 BuildRequires:  numpy-f2py
@@ -22,28 +19,39 @@ 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
+# libraries
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/PyQt4/Qwt5/.*\.so$
+%filter_setup
+}
+
 %description
 PyQwt is a set of Python bindings for the Qwt C++ class library which extends
 the Qt framework with widgets for scientific and engineering applications. It
 provides a widget to plot 2-dimensional data and various widgets to display and
 control bounded or unbounded floating point values.
 
+
 %package devel
 Summary: Files needed to build other bindings on PyQwt
 Group:   Development/Languages
 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.
 
+
 %prep
 %setup -q
 
 # mark examples non-executable
 find qt4examples/ -name "*.py" | xargs chmod a-x
 
+
 %build
 QWTDIR=%{_includedir}/qwt
 cd configure
@@ -51,15 +59,14 @@ cd configure
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 cd configure
 make DESTDIR=%{buildroot} install
-# move the generated pdf and html documentation to sphinx directory and remove the build files
+# move the generated pdf and html documentation to devel-doc directory
 cd ..
-mv sphinx/build/latex/PyQwt.pdf sphinx
+mkdir devel-doc
+mv sphinx/build/latex/PyQwt.pdf devel-doc
 rm sphinx/build/html/.buildinfo
-mv sphinx/build/html sphinx
-rm -rf sphinx/build
+mv sphinx/build/html devel-doc
 
 # non-executable scripts
 chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/grace.py
@@ -67,9 +74,6 @@ 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
- 
-%clean
-rm -rf %{buildroot}
 
 
 %files
@@ -78,13 +82,24 @@ rm -rf %{buildroot}
 %doc COPYING*
 %{python_sitearch}/PyQt4/*
 
+
 %files devel
 %defattr(-,root,root,-)
-%doc sphinx/*
+%doc devel-doc/*
 %doc qt4examples/ 
 %{_datadir}/sip/PyQt4/Qwt5/
 
+
 %changelog
+* Mon Jan 03 2011 Tadej Janež <tadej.janez at tadej.hicsalta.si> - 5.2.0-11
+- changes to the spec file that follow the latest Packaging Guidelines:
+  - removed BuildRoot tag
+  - removed %%clean section
+- removed private shared object provides that were reported by rpmlint
+- removed the manual definition of the python_sitearch macro
+- simplified the handling of devel documentation files
+- minor cosmetic cleanups
+
 * Fri Dec 10 2010 Rex Dieter <rdieter at fedoraproject.org> -  5.2.0-10
 - rebuild (sip, #662039))
 
@@ -138,3 +153,4 @@ rm -rf %{buildroot}
 
 * Tue Nov 18 2008 Tadej Janež <tadej.janez at tadej.hicsalta.si> 5.1.0-1
 - initial package
+