[plplot] Fix doc location

Orion Poplawski orion at fedoraproject.org
Thu Aug 8 01:06:27 UTC 2013


commit d8a3576a33eec4b9e091020e4d76b0c67d9745df
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed Aug 7 14:39:27 2013 -0600

    Fix doc location

 plplot.spec |   26 ++++----------------------
 1 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/plplot.spec b/plplot.spec
index aa1360c..dae1807 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -383,7 +383,6 @@ make %{?_smp_flags} VERBOSE=1
 rm -rf $RPM_BUILD_ROOT
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_docdir}/plplot $RPM_BUILD_ROOT%{_docdir}/plplot-%{version}
 
 # Fix up tclIndex files so they are the same on all builds
 for file in $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/*/tclIndex
@@ -452,8 +451,7 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
-%{_docdir}/plplot-%{version}/
+%{_docdir}/%{name}/
 %{_bindir}/pltek
 %{_bindir}/pstex2eps
 %{python_sitearch}/_plplotcmodule.so
@@ -476,7 +474,6 @@ fi
 %{_datadir}/plplot%{version}/examples/test_python.sh
 
 %files libs
-%defattr(-,root,root,-)
 %doc COPYING.LIB Copyright
 %{_libdir}/libcsirocsa.so.*
 %{_libdir}/libcsironn.so.*
@@ -509,7 +506,6 @@ fi
 %{_libdir}/plplot%{version}/driversd/xwin.driver_info
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/plplot/
 %{_libdir}/libcsirocsa.so
 %{_libdir}/libcsironn.so
@@ -542,11 +538,9 @@ fi
 
 %if %{with ada}
 %files ada
-%defattr(-,root,root,-)
 %{_libdir}/libplplotadad.so.*
 
 %files ada-devel
-%defattr(-,root,root,-)
 #Until we find an owner for %{_libdir}/ada/adalib/
 %{_libdir}/ada/
 #%{_libdir}/ada/adalib/plplotadad/
@@ -560,7 +554,6 @@ fi
 %endif
 
 %files fortran-devel
-%defattr(-,root,root,-)
 %{_fmoddir}/plf95demolib.mod
 %{_fmoddir}/plplot.mod
 %{_fmoddir}/plplot_flt.mod
@@ -573,24 +566,20 @@ fi
 %{_datadir}/plplot%{version}/examples/test_f95.sh
 
 %files java
-%defattr(-,root,root,-)
 %{_libdir}/plplot%{version}/plplotjavac_wrap.so
 %{_datadir}/java/plplot.jar
 
 %files java-devel
-%defattr(-,root,root,-)
 %{_datadir}/plplot%{version}/examples/java/
 %{_datadir}/plplot%{version}/examples/test_java.sh
 
 %files lua
-%defattr(-,root,root,-)
 %{_libdir}/lua/5.1/plplot/
 %{_datadir}/plplot%{version}/examples/lua/
 %{_datadir}/plplot%{version}/examples/test_lua.sh
 
 %if %{with ocaml}
 %files ocaml
-%defattr(-,root,root,-)
 %dir %{_libdir}/ocaml/plcairo/
 %{_libdir}/ocaml/plcairo/META
 %{_libdir}/ocaml/plcairo/*.cma
@@ -602,7 +591,6 @@ fi
 %{_libdir}/ocaml/stublibs/*
 
 %files ocaml-devel
-%defattr(-,root,root,-)
 %{_libdir}/pkgconfig/plplotd-ocaml.pc
 %{_libdir}/ocaml/plcairo/*.a
 %{_libdir}/ocaml/plcairo/*.cmxa
@@ -616,7 +604,6 @@ fi
 
 %if %{with octave}
 %files octave
-%defattr(-,root,root,-)
 %{_datadir}/plplot_octave/
 %{_datadir}/octave/site/m/PLplot/
 %{_libdir}/octave/site/oct/*/plplot_octave.oct
@@ -628,29 +615,24 @@ fi
 
 #%if %{with pdl}
 %files perl
-%defattr(-,root,root,-)
 %if %{with pdl}
 %{_datadir}/plplot%{version}/examples/perl/
 %{_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.so
 %{_libdir}/plplot%{version}/driversd/qt.driver_info
 
 %files qt-devel
-%defattr(-,root,root,-)
 %{_libdir}/libplplotqtd.so
 %{_libdir}/pkgconfig/plplotd-qt.pc
 
 %files tk
-%defattr(-,root,root,-)
 %{_bindir}/plserver
 %{_bindir}/pltcl
 %{_libdir}/libplplottcltkd.so.*
@@ -669,24 +651,24 @@ fi
 %{_mandir}/man1/pltcl.1.gz
 
 %files tk-devel
-%defattr(-,root,root,-)
 %{_libdir}/libplplottcltkd.so
 %{_libdir}/libtclmatrixd.so
 %{_libdir}/pkgconfig/plplotd-tcl.pc
 
 %files wxGTK
-%defattr(-,root,root,-)
 %{_libdir}/libplplotwxwidgetsd.so.*
 %{_libdir}/plplot%{version}/driversd/wxwidgets.so
 %{_libdir}/plplot%{version}/driversd/wxwidgets.driver_info
 
 %files wxGTK-devel
-%defattr(-,root,root,-)
 %{_libdir}/libplplotwxwidgetsd.so
 %{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
 
 %changelog
+* Wed Aug 7 2013 Orion Poplawski <orion at cora.nwra.com> - 5.9.9-16.svn12281
+- Fix doc location
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.9.9-16.svn12281
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list