rpms/PyQwt/F-11 PyQwt.spec,1.2,1.3

[Tadej Janež]

Author: tadej

Update of /cvs/pkgs/rpms/PyQwt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2070

Modified Files:
	PyQwt.spec 
Log Message:
Upgrade to version 5.2.0




Index: PyQwt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQwt/F-11/PyQwt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- PyQwt.spec	23 Feb 2009 22:32:30 -0000	1.2
+++ PyQwt.spec	23 Sep 2009 12:59:51 -0000	1.3
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           PyQwt
-Version:        5.1.0
-Release:        4%{?dist}
+Version:        5.2.0
+Release:        1%{?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,9 +53,18 @@ 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
+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}
@@ -65,15 +74,23 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc ANNOUNCEMENT-%{version} README
 %doc COPYING*
-%{python_sitearch}/PyQt4/Qwt5/
+%{python_sitearch}/PyQt4/*
 
 %files devel
 %defattr(-,root,root,-)
-%doc Doc/*
+%doc sphinx/*
 %doc qt4examples/ 
 %{_datadir}/sip/PyQt4/Qwt5/
 
 %changelog
+* Wed Sep 23 2009 Tadej Janež <tadej.janez at tadej.hicsalta.si> 5.2.0-1
+- upgrade to version 5.2.0, which supports newer versions of Qwt, PyQt4
+  and SIP (fixes RH bug #520095)
+- included new Sphinx genereted pdf and html documentation in -devel subpackage
+- made qplt.py executable (to fix a rpmlint error)
+- changed BuildRequires from numpy to numpy-f2py to cope with the numpy
+  package split
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild