rpms/globus-gsi-cert-utils/F-11 globus-gsi-cert-utils-ca-setup.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-gsi-cert-utils.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3

[Mattias Ellert]

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1889/F-11

Modified Files:
	.cvsignore globus-gsi-cert-utils.spec import.log sources 
Added Files:
	globus-gsi-cert-utils-ca-setup.patch 
Log Message:
* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.4-1
- Update to Globus Toolkit 5.0.0


globus-gsi-cert-utils-ca-setup.patch:
 grid-cert-request.in |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE globus-gsi-cert-utils-ca-setup.patch ---
diff -ur globus_gsi_cert_utils-6.4.orig/programs/grid-cert-request.in globus_gsi_cert_utils-6.4/programs/grid-cert-request.in
--- globus_gsi_cert_utils-6.4.orig/programs/grid-cert-request.in	2008-10-15 17:19:43.000000000 +0200
+++ globus_gsi_cert_utils-6.4/programs/grid-cert-request.in	2010-02-06 09:05:18.525154538 +0100
@@ -865,9 +865,12 @@
         echo "    \${GLOBUS_LOCATION}/etc/globus-user-ssl.conf"
         echo "    \${GLOBUS_LOCATION}/etc/globus-host-ssl.conf"
         echo ""
-        echo "Can't find valid CA config files. Please make sure"
-        echo "that the grid administrator has installed a CA setup "
-        echo "package and run gpt-postinstall."
+        echo "Can't find valid CA config files."
+        echo "Not all CAs use this tool to generate certificate requests."
+        echo "If your CA is using this tool, make sure that you have installed"
+        echo "your CA's setup package."
+        echo "If your CA is not using this tool, consult the CA documentation"
+        echo "to find the right way to request a certificate."
     fi
 
     echo ""


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Apr 2009 06:54:05 -0000	1.2
+++ .cvsignore	9 Feb 2010 07:42:26 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_gsi_cert_utils-5.5.tar.gz
+globus_gsi_cert_utils-6.4.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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-gsi-cert-utils.spec	25 Jul 2009 07:31:16 -0000	1.3
+++ globus-gsi-cert-utils.spec	9 Feb 2010 07:42:26 -0000	1.4
@@ -6,17 +6,26 @@
 
 Name:		globus-gsi-cert-utils
 %global _name %(tr - _ <<< %{name})
-Version:	5.5
-Release:	3%{?dist}
+Version:	6.4
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GSI Cert Utils Library
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-Source:		http://www-unix.globus.org/ftppub/gt4/4.2.1/updates/src/%{_name}-%{version}.tar.gz
+#		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
+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
 Source9:	epstopdf-2.9.5gw
+#		Improve the error message for missing CA setup files:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6964
+Patch0:		%{name}-ca-setup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -101,6 +110,7 @@ Globus GSI Cert Utils Library Documentat
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -168,6 +178,10 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%
 sed -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.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 $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
   | sed s!^!%{_prefix}! > package.filelist
@@ -188,6 +202,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -f package.filelist
 %defattr(-,root,root,-)
 %dir %{_datadir}/globus/packages/%{_name}
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
 
 %files -f package-progs.filelist progs
 %defattr(-,root,root,-)
@@ -198,10 +214,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f package-doc.filelist doc
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.4-1
+- Update to Globus Toolkit 5.0.0
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.5-4
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.5-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jun 2009 16:39:50 -0000	1.2
+++ import.log	9 Feb 2010 07:42:26 -0000	1.3
@@ -1,2 +1,3 @@
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Apr 2009 06:54:05 -0000	1.2
+++ sources	9 Feb 2010 07:42:26 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-48987f39031ac79949a9b0913aa42c67  globus_gsi_cert_utils-5.5.tar.gz
+f5d8a684c37a41b01aa23d753c155e44  globus_gsi_cert_utils-6.4.tar.gz