rpms/globus-gsi-cert-utils/F-11 .cvsignore, 1.3, 1.4 globus-gsi-cert-utils.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.3, 1.4

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21792/F-11

Modified Files:
	.cvsignore globus-gsi-cert-utils.spec import.log sources 
Log Message:
* Wed Apr 14 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.5-1
- Update to Globus Toolkit 5.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	9 Feb 2010 07:42:26 -0000	1.3
+++ .cvsignore	16 Apr 2010 14:47:57 -0000	1.4
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_gsi_cert_utils-6.4.tar.gz
+globus_gsi_cert_utils-6.5.tar.gz


Index: globus-gsi-cert-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11/globus-gsi-cert-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-gsi-cert-utils.spec	9 Feb 2010 07:42:26 -0000	1.4
+++ globus-gsi-cert-utils.spec	16 Apr 2010 14:47:58 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:		globus-gsi-cert-utils
 %global _name %(tr - _ <<< %{name})
-Version:	6.4
+Version:	6.5
 Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GSI Cert Utils Library
 
@@ -14,11 +14,11 @@ Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
 #		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.0/installers/src/gt5.0.0-all-source-installer.tar.bz2
-#		tar -jxf gt5.0.0-all-source-installer.tar.bz2
-#		mv gt5.0.0-all-source-installer/source-trees/gsi/cert_utils/source globus_gsi_cert_utils-6.4
-#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_cert_utils-6.4
-#		tar -zcf globus_gsi_cert_utils-6.4.tar.gz globus_gsi_cert_utils-6.4
+#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.1/installers/src/gt5.0.1-all-source-installer.tar.bz2
+#		tar -jxf gt5.0.1-all-source-installer.tar.bz2
+#		mv gt5.0.1-all-source-installer/source-trees/gsi/cert_utils/source globus_gsi_cert_utils-6.5
+#		cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_cert_utils-6.5
+#		tar -zcf globus_gsi_cert_utils-6.5.tar.gz globus_gsi_cert_utils-6.5
 Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
@@ -167,6 +167,17 @@ 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 admin binary to sbin
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT%{_bindir}/grid-default-ca $RPM_BUILD_ROOT%{_sbindir}
+sed 's!/bin/grid-default-ca!/sbin/grid-default-ca!' \
+  -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
+
+# Move client man pages to progs 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}
@@ -186,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 \
@@ -217,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Apr 14 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.5-1
+- Update to Globus Toolkit 5.0.1
+
 * Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.4-1
 - Update to Globus Toolkit 5.0.0
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	9 Feb 2010 07:42:26 -0000	1.3
+++ import.log	16 Apr 2010 14:47:58 -0000	1.4
@@ -1,3 +1,4 @@
 globus-gsi-cert-utils-5_5-1_fc9:F-11:globus-gsi-cert-utils-5.5-1.fc9.src.rpm:1241074413
 globus-gsi-cert-utils-5_5-2_fc9:F-11:globus-gsi-cert-utils-5.5-2.fc9.src.rpm:1245083969
 globus-gsi-cert-utils-6_4-1_fc12:F-11:globus-gsi-cert-utils-6.4-1.fc12.src.rpm:1265701332
+globus-gsi-cert-utils-6_5-1_fc12:F-11:globus-gsi-cert-utils-6.5-1.fc12.src.rpm:1271429261


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	9 Feb 2010 07:42:26 -0000	1.3
+++ sources	16 Apr 2010 14:47:58 -0000	1.4
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-f5d8a684c37a41b01aa23d753c155e44  globus_gsi_cert_utils-6.4.tar.gz
+5a8726e6a6bf0a59c02335e149eb032d  globus_gsi_cert_utils-6.5.tar.gz