rpms/globus-gss-assist/EL-5 globus-gss-assist.spec, 1.6, 1.7 import.log, 1.5, 1.6

Mattias Ellert ellert at fedoraproject.org
Sun Jul 18 04:55:30 UTC 2010


Author: ellert

Update of /cvs/pkgs/rpms/globus-gss-assist/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6298/EL-5

Modified Files:
	globus-gss-assist.spec import.log 
Log Message:
* Sun Jul 18 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-2
- Move client man pages to progs package



Index: globus-gss-assist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gss-assist/EL-5/globus-gss-assist.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-gss-assist.spec	17 Jul 2010 17:02:31 -0000	1.6
+++ globus-gss-assist.spec	18 Jul 2010 04:55:29 -0000	1.7
@@ -7,7 +7,7 @@
 Name:		globus-gss-assist
 %global _name %(tr - _ <<< %{name})
 Version:	5.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Globus Toolkit - GSSAPI Assist library
 
 Group:		System Environment/Libraries
@@ -173,6 +173,11 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgco
 %{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
 
+# Move client man pages to progs package
+grep '.8$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+  >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
+sed '/.8$/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}
@@ -192,7 +197,7 @@ install -m 644 -p GLOBUS_LICENSE $RPM_BU
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
-  | sed s!^!%{_prefix}! > package-progs.filelist
+  | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package-progs.filelist
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
   | sed s!^!%{_prefix}! > package-devel.filelist
 cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
@@ -223,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Sun Jul 18 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-2
+- Move client man pages to progs package
+
 * Sat Jul 17 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-1
 - Update to Globus Toolkit 5.0.2
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gss-assist/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	17 Jul 2010 17:02:31 -0000	1.5
+++ import.log	18 Jul 2010 04:55:30 -0000	1.6
@@ -3,3 +3,4 @@ globus-gss-assist-4_0-2_fc9:EL-5:globus-
 globus-gss-assist-5_5-1_fc12:EL-5:globus-gss-assist-5.5-1.fc12.src.rpm:1265702910
 globus-gss-assist-5_8-1_fc12:EL-5:globus-gss-assist-5.8-1.fc12.src.rpm:1271430762
 globus-gss-assist-5_9-1_fc12:EL-5:globus-gss-assist-5.9-1.fc12.src.rpm:1279386134
+globus-gss-assist-5_9-2_fc12:EL-5:globus-gss-assist-5.9-2.fc12.src.rpm:1279428914



More information about the scm-commits mailing list