rpms/globus-gram-job-manager/EL-5 globus-gram-job-manager.spec, 1.4, 1.5 import.log, 1.4, 1.5

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-gram-job-manager/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7431/EL-5

Modified Files:
	globus-gram-job-manager.spec import.log 
Log Message:
* Sun Jul 18 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.59-2
- Move client and server man pages to main package



Index: globus-gram-job-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager/EL-5/globus-gram-job-manager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-gram-job-manager.spec	17 Jul 2010 19:46:12 -0000	1.4
+++ globus-gram-job-manager.spec	18 Jul 2010 05:01:16 -0000	1.5
@@ -8,7 +8,7 @@ Name:		globus-gram-job-manager
 %global _name %(tr - _ <<< %{name})
 Version:	10.59
 %global setupversion 4.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - GRAM Jobmanager
 
 Group:		Applications/Internet
@@ -196,6 +196,11 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/%{_name
 sed s!share/%{_name}!share/globus! \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
 
+# Move client and server man pages to main package
+grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+  >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
+sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+
 # Move documentation to default RPM location
 mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -227,7 +232,7 @@ install -m 644 -p GLOBUS_LICENSE $RPM_BU
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
     $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
     $GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_pgm.filelist \
-  | sed s!^!%{_prefix}! > package.filelist
+  | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package.filelist
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
     $GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
@@ -251,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-setup-%{setupversion}/html
 
 %changelog
+* Sun Jul 18 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.59-2
+- Move client and server man pages to main package
+
 * Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.59-1
 - Update to Globus Toolkit 5.0.2
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gram-job-manager/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	17 Jul 2010 19:46:12 -0000	1.4
+++ import.log	18 Jul 2010 05:01:16 -0000	1.5
@@ -2,3 +2,4 @@ globus-gram-job-manager-10_17-1_fc12:EL-
 globus-gram-job-manager-10_42-1_fc12:EL-5:globus-gram-job-manager-10.42-1.fc12.src.rpm:1271435123
 globus-gram-job-manager-10_42-2_fc12:EL-5:globus-gram-job-manager-10.42-2.fc12.src.rpm:1275756872
 globus-gram-job-manager-10_59-1_fc12:EL-5:globus-gram-job-manager-10.59-1.fc12.src.rpm:1279395955
+globus-gram-job-manager-10_59-2_fc12:EL-5:globus-gram-job-manager-10.59-2.fc12.src.rpm:1279429260