rpms/globus-gatekeeper/F-12 .cvsignore, 1.2, 1.3 globus-gatekeeper.patch, 1.1, 1.2 globus-gatekeeper.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3

Mattias Ellert ellert at fedoraproject.org
Tue Feb 9 09:34:59 UTC 2010


Author: ellert

Update of /cvs/pkgs/rpms/globus-gatekeeper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13772/F-12

Modified Files:
	.cvsignore globus-gatekeeper.patch globus-gatekeeper.spec 
	import.log sources 
Log Message:
* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.3-1
- Update to Globus Toolkit 5.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 Oct 2009 18:16:25 -0000	1.2
+++ .cvsignore	9 Feb 2010 09:34:58 -0000	1.3
@@ -1,2 +1,2 @@
-globus_gatekeeper-5.0.tar.gz
+globus_gatekeeper-5.3.tar.gz
 globus_gatekeeper_setup-2.2.tar.gz

globus-gatekeeper.patch:
 Makefile.am         |    4 +---
 configure.in        |    4 ----
 globus_gatekeeper.c |   45 +++------------------------------------------
 3 files changed, 4 insertions(+), 49 deletions(-)

Index: globus-gatekeeper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/F-12/globus-gatekeeper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gatekeeper.patch	19 Oct 2009 18:16:25 -0000	1.1
+++ globus-gatekeeper.patch	9 Feb 2010 09:34:58 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur globus_gatekeeper-5.0.orig/configure.in globus_gatekeeper-5.0/configure.in
---- globus_gatekeeper-5.0.orig/configure.in	2004-08-24 17:38:10.000000000 +0200
-+++ globus_gatekeeper-5.0/configure.in	2009-07-29 01:30:55.624708882 +0200
+diff -ur globus_gatekeeper-5.3.orig/configure.in globus_gatekeeper-5.3/configure.in
+--- globus_gatekeeper-5.3.orig/configure.in	2009-10-28 01:07:00.000000000 +0100
++++ globus_gatekeeper-5.3/configure.in	2010-01-23 18:01:33.387283644 +0100
 @@ -24,10 +24,6 @@
  esac
  AC_SUBST(UNICOS_LIBS)
@@ -12,9 +12,9 @@ diff -ur globus_gatekeeper-5.0.orig/conf
  AC_CHECK_HEADERS(proj.h)
  AC_CHECK_HEADERS(netinet/tcp.h)
  AC_CHECK_HEADERS(string.h)
-diff -ur globus_gatekeeper-5.0.orig/globus_gatekeeper.c globus_gatekeeper-5.0/globus_gatekeeper.c
---- globus_gatekeeper-5.0.orig/globus_gatekeeper.c	2008-08-15 11:09:53.000000000 +0200
-+++ globus_gatekeeper-5.0/globus_gatekeeper.c	2009-08-06 08:44:45.674401405 +0200
+diff -ur globus_gatekeeper-5.3.orig/globus_gatekeeper.c globus_gatekeeper-5.3/globus_gatekeeper.c
+--- globus_gatekeeper-5.3.orig/globus_gatekeeper.c	2009-10-28 01:07:00.000000000 +0100
++++ globus_gatekeeper-5.3/globus_gatekeeper.c	2010-01-23 18:01:33.388282582 +0100
 @@ -109,10 +109,6 @@
  #include <proj.h>
  #endif
@@ -54,7 +54,7 @@ diff -ur globus_gatekeeper-5.0.orig/glob
  #define FAILED_AUTHORIZATION        1
  #define FAILED_SERVICELOOKUP        2
  #define FAILED_SERVER               3
-@@ -600,34 +593,7 @@
+@@ -599,34 +592,7 @@
           * gatekeeperhome (-home path) when not run from inetd. 
           * otherwise it is NULL
           */
@@ -90,7 +90,7 @@ diff -ur globus_gatekeeper-5.0.orig/glob
          run_from_inetd = 0;
      }
      else
-@@ -964,11 +930,6 @@
+@@ -957,11 +923,6 @@
          foreground = 1;
      }
  
@@ -100,13 +100,13 @@ diff -ur globus_gatekeeper-5.0.orig/glob
 -    }
 -        
      setenv("GRIDMAP", genfilename(gatekeeperhome,gridmap,NULL),1);
-     if (globuspwd) 
-     {
-diff -ur globus_gatekeeper-5.0.orig/Makefile.am globus_gatekeeper-5.0/Makefile.am
---- globus_gatekeeper-5.0.orig/Makefile.am	2004-08-24 17:38:10.000000000 +0200
-+++ globus_gatekeeper-5.0/Makefile.am	2009-07-29 01:42:48.544708833 +0200
-@@ -10,9 +10,7 @@
- EXTRA_DIST=
+ 
+     if (x509_cert_dir)
+diff -ur globus_gatekeeper-5.3.orig/Makefile.am globus_gatekeeper-5.3/Makefile.am
+--- globus_gatekeeper-5.3.orig/Makefile.am	2009-10-28 01:07:00.000000000 +0100
++++ globus_gatekeeper-5.3/Makefile.am	2010-01-23 18:01:33.388282582 +0100
+@@ -8,9 +8,7 @@
+ LDADD = $(GPT_PGM_LINKS) @LIBOBJS@ @UNICOS_LIBS@
  
  sbin_PROGRAMS= \
 -	globus-gatekeeper


Index: globus-gatekeeper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/F-12/globus-gatekeeper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gatekeeper.spec	19 Oct 2009 18:16:25 -0000	1.1
+++ globus-gatekeeper.spec	9 Feb 2010 09:34:58 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:		globus-gatekeeper
 %global _name %(tr - _ <<< %{name})
-Version:	5.0
+Version:	5.3
 %global setupversion 2.2
 Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus Gatekeeper
@@ -15,17 +15,17 @@ Group:		Applications/Internet
 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/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/gatekeeper/source globus_gatekeeper-5.0
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper-5.0
-#		tar -zcf globus_gatekeeper-5.0.tar.gz globus_gatekeeper-5.0
+#		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/gatekeeper/source globus_gatekeeper-5.3
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper-5.3
+#		tar -zcf globus_gatekeeper-5.3.tar.gz globus_gatekeeper-5.3
 Source:		%{_name}-%{version}.tar.gz
 #		Source1 is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/gatekeeper/setup globus_gatekeeper_setup-2.2
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper_setup-2.2
+#		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/gatekeeper/setup globus_gatekeeper_setup-2.2
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gatekeeper_setup-2.2
 #		tar -zcf globus_gatekeeper_setup-2.2.tar.gz globus_gatekeeper_setup-2.2
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		Fixes for FHS installation:
@@ -122,8 +122,9 @@ install -m 644 -p GLOBUS_LICENSE $RPM_BU
 
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
+    $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
     $GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_pgm.filelist \
-  | sed s!^!%{_prefix}! > package.filelist
+  | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package.filelist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,5 +139,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/globus/setup
 
 %changelog
+* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.3-1
+- Update to Globus Toolkit 5.0.0
+
 * Wed Jul 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0-1
 - Autogenerated


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 Oct 2009 18:16:25 -0000	1.1
+++ import.log	9 Feb 2010 09:34:58 -0000	1.2
@@ -1 +1,2 @@
 globus-gatekeeper-5_0-1_fc11:F-12:globus-gatekeeper-5.0-1.fc11.src.rpm:1255976144
+globus-gatekeeper-5_3-1_fc12:F-12:globus-gatekeeper-5.3-1.fc12.src.rpm:1265708084


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gatekeeper/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 Oct 2009 18:16:25 -0000	1.2
+++ sources	9 Feb 2010 09:34:58 -0000	1.3
@@ -1,2 +1,2 @@
-96dc37477340e9e3f6fc5a981510a5c5  globus_gatekeeper-5.0.tar.gz
-7aebcc8960634f8c8fd1077f25975c4f  globus_gatekeeper_setup-2.2.tar.gz
+7b71b37330ec2559c7315138b1e568ed  globus_gatekeeper-5.3.tar.gz
+3d673b3fa193a4cdcf3115e6d4b9613e  globus_gatekeeper_setup-2.2.tar.gz



More information about the scm-commits mailing list