rpms/PyQwt/devel PyQwt.spec,1.4,1.5

[Tadej Janež]

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23822

Modified Files:
	PyQwt.spec 
Log Message:
- made qplt.py executable (to fix a rpmlint error)
- removed html/.buildinfo from sphinx documentation (to fix a rpmlint error)
- changed BuildRequires from numpy to numpy-f2py to cope with the numpy
  package split
- temporarily removed qwt.py* files which conflict with the ones provided
  by the PyQt4 package




Index: PyQwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/devel/PyQwt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- PyQwt.spec	7 Sep 2009 05:27:53 -0000	1.4
+++ PyQwt.spec	28 Oct 2009 13:14:28 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           PyQwt
 Version:        5.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for Qwt
 
 Group:          Development/Languages
@@ -15,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  python-devel
 BuildRequires:  sip-devel
 BuildRequires:  PyQt4-devel
-BuildRequires:  numpy
+BuildRequires:  numpy-f2py
 BuildRequires:  qwt-devel
 
 Requires:       PyQt4
@@ -53,13 +53,19 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 cd configure
 make DESTDIR=%{buildroot} install
+# move the generated pdf and html documentation to sphinx directory and remove the build files
 cd ..
 mv sphinx/build/latex/PyQwt.pdf sphinx
+rm sphinx/build/html/.buildinfo
 mv sphinx/build/html sphinx
 rm -rf sphinx/build
 
-# non-executable script
+# non-executable scripts
 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
  
 %clean
 rm -rf %{buildroot}
@@ -78,6 +84,14 @@ rm -rf %{buildroot}
 %{_datadir}/sip/PyQt4/Qwt5/
 
 %changelog
+* Wed Oct 28 2009 Tadej Janež <tadej.janez at tadej.hicsalta.si> 5.2.0-2
+- made qplt.py executable (to fix a rpmlint error)
+- removed html/.buildinfo from sphinx documentation (to fix a rpmlint error)
+- changed BuildRequires from numpy to numpy-f2py to cope with the numpy
+  package split
+- temporarily removed qwt.py* files which conflict with the ones provided
+  by the PyQt4 package
+
 * Sun Sep  6 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 5.2.0-1
 - Fix FTBFS: Update to 5.2.0