rpms/plplot/devel plplot.spec,1.90,1.91

[Orion Poplawski]

Author: orion

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

Modified Files:
	plplot.spec 
Log Message:
* Mon Oct 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-3
- Create fortran-devel sub-package with fortran development files (bug #523543)



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- plplot.spec	28 Sep 2009 22:45:43 -0000	1.90
+++ plplot.spec	26 Oct 2009 17:55:14 -0000	1.91
@@ -10,7 +10,7 @@
 
 Name:           plplot
 Version:        5.9.5
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -141,6 +141,18 @@ Requires:       gcc-gnat
 %{summary}.
 
 
+%package        fortran-devel
+Summary:        Development files for using PLplot Fortran bindings
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       gcc-gfortran%{_isa}
+Requires:       pkgconfig
+
+%description    fortran-devel
+%{summary}.
+
+
 %package        java
 Summary:        Functions for scientific plotting with Java
 Group:          Development/Libraries
@@ -374,6 +386,11 @@ done
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/cmake/modules/Platform
 
+#Move fortran modules to proper location
+mkdir -p $RPM_BUILD_ROOT%{_fmoddir}
+mv $RPM_BUILD_ROOT%{_libdir}/fortran/modules/plplot/*.mod %{_fmoddir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/fortran
+
 
 %check
 cd fedora
@@ -431,7 +448,6 @@ fi
 %{_bindir}/pstex2eps
 %{python_sitearch}/_plplotcmodule.so
 %{python_sitearch}/plplot.py*
-%{python_sitearch}/plplot_widgetmodule.so
 %{python_sitearch}/plplotc.py*
 %{python_sitearch}/Plframe.py*
 %{python_sitearch}/TclSup.py*
@@ -445,10 +461,11 @@ fi
 %{_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
+%{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/plplot-test.sh
 %{_datadir}/plplot%{version}/examples/plplot-test-interactive.sh
+%{_datadir}/plplot%{version}/examples/python/
+%{_datadir}/plplot%{version}/examples/test_python.sh
 
 %files libs
 %defattr(-,root,root,-)
@@ -496,16 +513,9 @@ fi
 %{_libdir}/libcsironn.so
 %{_libdir}/libplplotcxxd.so
 %{_libdir}/libplplotd.so
-%{_libdir}/libplplotf77cd.so
-%{_libdir}/libplplotf77d.so
-%{_libdir}/libplplotf95cd.so
-%{_libdir}/libplplotf95d.so
 %{_libdir}/libqsastime.so
-%{_libdir}/fortran/
 %{_libdir}/pkgconfig/plplotd.pc
 %{_libdir}/pkgconfig/plplotd-c++.pc
-%{_libdir}/pkgconfig/plplotd-f77.pc
-%{_libdir}/pkgconfig/plplotd-f95.pc
 %{_datadir}/plplot%{version}/examples/CMakeLists.txt
 %dir %{_datadir}/plplot%{version}/examples/cmake
 %dir %{_datadir}/plplot%{version}/examples/cmake/modules
@@ -515,17 +525,12 @@ fi
 %{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/pkg-config.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/plplot_configure.cmake
-%{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/c/
 %{_datadir}/plplot%{version}/examples/c++/
-%{_datadir}/plplot%{version}/examples/f77/
-%{_datadir}/plplot%{version}/examples/f95/
 %{_datadir}/plplot%{version}/examples/Makefile
 %{_datadir}/plplot%{version}/examples/test_c.sh
 %{_datadir}/plplot%{version}/examples/test_cxx.sh
 %{_datadir}/plplot%{version}/examples/test_diff.sh
-%{_datadir}/plplot%{version}/examples/test_f77.sh
-%{_datadir}/plplot%{version}/examples/test_f95.sh
 %{_mandir}/man3/pl*.3*
 
 %files ada
@@ -549,6 +554,22 @@ fi
 %{_datadir}/plplot%{version}/examples/cmake/modules/CMakeDetermineAdaCompiler.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/CMakeTestAdaCompiler.cmake
 
+%files fortran-devel
+%defattr(-,root,root,-)
+%{_fmoddir}/plplot.mod
+%{_fmoddir}/plplot_flt.mod
+%{_fmoddir}/plplotp.mod
+%{_libdir}/libplplotf77cd.so
+%{_libdir}/libplplotf77d.so
+%{_libdir}/libplplotf95cd.so
+%{_libdir}/libplplotf95d.so
+%{_libdir}/pkgconfig/plplotd-f77.pc
+%{_libdir}/pkgconfig/plplotd-f95.pc
+%{_datadir}/plplot%{version}/examples/f77/
+%{_datadir}/plplot%{version}/examples/f95/
+%{_datadir}/plplot%{version}/examples/test_f77.sh
+%{_datadir}/plplot%{version}/examples/test_f95.sh
+
 %files java
 %defattr(-,root,root,-)
 %{_libdir}/plplot%{version}/plplotjavac_wrap.so
@@ -626,6 +647,7 @@ fi
 %{_libdir}/plplot%{version}/driversd/tk.so
 %{_libdir}/plplot%{version}/driversd/tkwin.rc
 %{_libdir}/plplot%{version}/driversd/tkwin.so
+%{python_sitearch}/plplot_widgetmodule.so
 %{_datadir}/plplot%{version}/pkgIndex.tcl
 %{_datadir}/plplot%{version}/examples/test_tcl.sh
 %{_datadir}/plplot%{version}/examples/tcl/
@@ -653,6 +675,12 @@ fi
 
 
 %changelog
+* Mon Oct 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-3
+- Create fortran-devel sub-package with fortran development files (bug #523543)
+
+* Thu Oct 22 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-2
+- Move the python plplot_widgetmodule.so to the tk sub-package
+
 * 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.