rpms/plplot/devel plplot.spec,1.88,1.89

[Orion Poplawski]

Author: orion

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

Modified Files:
	plplot.spec 
Log Message:
Add qt and pyqt subpackages.
Add other missing files.
Remove ocaml dep stuff.



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- plplot.spec	28 Sep 2009 17:54:30 -0000	1.88
+++ plplot.spec	28 Sep 2009 22:35:29 -0000	1.89
@@ -177,9 +177,6 @@ Summary:        Functions for scientific
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Provides:       ocaml-plplot = %{version}-%{release}
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description    ocaml
 %{summary}.
@@ -219,6 +216,35 @@ Requires:       %{name} = %{version}-%{r
 %endif
 
 
+%package        pyqt
+Summary:        Functions for scientific plotting with PyQt
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    pyqt
+%{summary}.
+
+
+%package        qt
+Summary:        Functions for scientific plotting with Qt
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    qt
+%{summary}.
+
+%package        qt-devel
+Summary:        Development files for using PLplot with Qt
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}-qt = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    qt-devel
+%{summary}.
+
+
 %package        tk
 Summary:        Functions for scientific plotting with Tk
 Group:          Development/Libraries
@@ -346,6 +372,9 @@ do
    cat tclIndex.hd tclIndex > ${file}
 done
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/{CMakeLists.txt,cmake}
+
+
 %check
 cd fedora
 #Hack
@@ -383,6 +412,9 @@ fi
 %postun octave -p /sbin/ldconfig
 %endif
 
+%post   qt -p /sbin/ldconfig
+%postun qt -p /sbin/ldconfig
+
 %post   tk -p /sbin/ldconfig
 %postun tk -p /sbin/ldconfig
 
@@ -401,14 +433,17 @@ fi
 %{python_sitearch}/plplot.py*
 %{python_sitearch}/plplot_widgetmodule.so
 %{python_sitearch}/plplotc.py*
+%{python_sitearch}/Plframe.py*
+%{python_sitearch}/TclSup.py*
 %{_infodir}/plplotdoc.info*
 %{_mandir}/man1/plm2gif.1.gz
 %{_mandir}/man1/plpr.1.gz
 %{_mandir}/man1/pltek.1.gz
 %{_mandir}/man1/pstex2eps.1.gz
 %dir %{_datadir}/plplot%{version}
-%{_datadir}/plplot%{version}/*.map
 %{_datadir}/plplot%{version}/*.fnt
+%{_datadir}/plplot%{version}/*.map
+%{_datadir}/plplot%{version}/*.pal
 %dir %{_datadir}/plplot%{version}/examples
 %{_datadir}/plplot%{version}/examples/python/
 %{_datadir}/plplot%{version}/examples/test_python.sh
@@ -553,6 +588,21 @@ fi
 %{_datadir}/plplot%{version}/examples/test_pdl.sh
 %endif
 
+%files pyqt
+%defattr(-,root,root,-)
+%{python_sitearch}/plplot_pyqt4.so
+
+%files qt
+%defattr(-,root,root,-)
+%{_libdir}/libplplotqtd.so.*
+%{_libdir}/plplot%{version}/driversd/qt.rc
+%{_libdir}/plplot%{version}/driversd/qt.so
+
+%files qt-devel
+%defattr(-,root,root,-)
+%{_libdir}/libplplotqtd.so
+%{_libdir}/pkgconfig/plplotd-qt.pc
+
 %files tk
 %defattr(-,root,root,-)
 %{_bindir}/plserver
@@ -593,6 +643,7 @@ fi
 * Mon Sep 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-1
 - Update to 5.9.5
 - Disable qt tests for now until Xvfb bug is fixed.
+- Remove ocaml dep code for now - breaks other dep generation
 
 * Wed Aug 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.4-8
 - Update octave patch to hopefully fix remaining issue.