rpms/GMT-doc/EL-4 GMT-doc.spec,1.3,1.4

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/GMT-doc/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8781

Modified Files:
	GMT-doc.spec 
Log Message:
Merge in Fedora changes


Index: GMT-doc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GMT-doc/EL-4/GMT-doc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GMT-doc.spec	29 May 2008 20:02:50 -0000	1.3
+++ GMT-doc.spec	29 May 2008 20:05:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           GMT-doc
 Version:        4.3.1
-Release:        2
+Release:        3
 Summary:        Documentation for Generic Mapping Tools
 
 Group:          Documentation
@@ -30,12 +30,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_docdir}/GMT-%{version}
-#Install pdf
-cp -pr www/gmt/doc/pdf $RPM_BUILD_ROOT/%{_docdir}/GMT-%{version}/
+#Install www and pdf
+cp -pr www/gmt/* $RPM_BUILD_ROOT/%{_docdir}/GMT-%{version}/
 #Install tutorial
 cp -pr tutorial $RPM_BUILD_ROOT/%{_docdir}/GMT-%{version}/
-#Install www
-cp -pr www/gmt/doc/html $RPM_BUILD_ROOT/%{_docdir}/GMT-%{version}/
 
 
 %clean
@@ -45,15 +43,16 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_docdir}/GMT-%{version}/pdf
-%{_docdir}/GMT-%{version}/tutorial
-%{_docdir}/GMT-%{version}/html
+%{_docdir}/GMT-%{version}/*
 
 
 %changelog
-* Thu May 29 2008 Orion Poplawski <orion at cora.nwra.com> 4.3.1-2
+* Thu May 29 2008 Orion Poplawski <orion at cora.nwra.com> 4.3.1-3
 - Bump release for EPEL
 
+* Wed May 21 2008 Orion Poplawski <orion at cora.nwra.com> 4.3.1-2
+- Install the index files properly
+
 * Wed May 21 2008 Orion Poplawski <orion at cora.nwra.com> 4.3.1-1
 - Update to 4.3.1