rpms/globus-core/F-9 globus-core.spec,1.2,1.3 import.log,1.2,1.3

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-core/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22606/F-9

Modified Files:
	globus-core.spec import.log 
Log Message:
* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
- Update after clarification of packaging guidelines



Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/globus-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globus-core.spec	17 Apr 2009 21:24:17 -0000	1.2
+++ globus-core.spec	21 Apr 2009 14:50:40 -0000	1.3
@@ -13,7 +13,7 @@
 Name:		globus-core
 %global _name %(tr - _ <<< %{name})
 Version:	5.15
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Globus Toolkit - Globus Core
 
 Group:		Development/Tools
@@ -133,10 +133,15 @@
   pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
+# Remove license file installed directly in the buildroot
 rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
 sed /GLOBUS_LICENSE/d \
   -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
 
+# Install license file
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 # Generate package filelists
 cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
     $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
@@ -149,7 +154,6 @@
 
 %files -f package.filelist
 %defattr(-,root,root,-)
-%doc GLOBUS_LICENSE
 %dir %{_datadir}/globus
 %dir %{_datadir}/globus/aclocal
 %dir %{_datadir}/globus/doxygen
@@ -160,8 +164,13 @@
 %dir %{_libdir}/globus/include
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/globus/globus-gpt2pkg-config
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %changelog
+* Tue Apr 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-3
+- Update after clarification of packaging guidelines
+
 * Wed Apr 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-2
 - Make comment about source retrieval more explicit
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	17 Apr 2009 21:24:17 -0000	1.2
+++ import.log	21 Apr 2009 14:50:40 -0000	1.3
@@ -1,2 +1,3 @@
 globus-core-5_15-1_fc9:F-9:globus-core-5.15-1.fc9.src.rpm:1237533936
 globus-core-5_15-2_fc9:F-9:globus-core-5.15-2.fc9.src.rpm:1240003398
+globus-core-5_15-3_fc9:F-9:globus-core-5.15-3.fc9.src.rpm:1240325336