rpms/globus-rls-server/F-12 .cvsignore, 1.2, 1.3 globus-rls-server-setup.patch, 1.1, 1.2 globus-rls-server.spec, 1.4, 1.5 import.log, 1.2, 1.3 sources, 1.2, 1.3 globus-rls-server-setup-strlen.patch, 1.1, NONE globus-rls-server-strlen.patch, 1.1, NONE globus-rls-server.patch, 1.1, NONE

[Mattias Ellert]

Author: ellert

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-server/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	6 Jun 2009 03:19:39 -0000	1.2
+++ .cvsignore	9 Feb 2010 08:57:10 -0000	1.3
@@ -1,2 +1,2 @@
-globus_rls_server-4.7.tar.gz
-globus_rls_server_setup-4.4.tar.gz
+globus_rls_server-4.9.tar.gz
+globus_rls_server_setup-4.5.tar.gz

globus-rls-server-setup.patch:
 setup-globus-rls-server |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: globus-rls-server-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-server/F-12/globus-rls-server-setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-rls-server-setup.patch	6 Jun 2009 03:19:40 -0000	1.1
+++ globus-rls-server-setup.patch	9 Feb 2010 08:57:10 -0000	1.2
@@ -1,260 +1,9 @@
-diff -ur globus_rls_server_setup-4.4.orig/configure.in globus_rls_server_setup-4.4/configure.in
---- globus_rls_server_setup-4.4.orig/configure.in	2004-02-11 03:15:25.000000000 +0100
-+++ globus_rls_server_setup-4.4/configure.in	2008-10-25 08:26:42.000000000 +0200
-@@ -3,13 +3,6 @@
- AC_REVISION($Revision$)
- AC_INIT(Makefile.am)
- 
--if test "x$GLOBUS_LOCATION" = "x"; then
--    echo "ERROR Please specify GLOBUS_LOCATION" >&2
--    exit 1
--fi
--
--AC_SUBST(GLOBUS_LOCATION)
--
- GLOBUS_INIT
- 
- AM_PROG_LIBTOOL
-diff -ur globus_rls_server_setup-4.4.orig/odbc.ini.in globus_rls_server_setup-4.4/odbc.ini.in
---- globus_rls_server_setup-4.4.orig/odbc.ini.in	2007-06-14 09:48:35.000000000 +0200
-+++ globus_rls_server_setup-4.4/odbc.ini.in	2008-10-25 10:25:46.000000000 +0200
-@@ -1,19 +1,27 @@
- [lrc1000]
--Driver      = @GLOBUS_LOCATION@/lib/libsqlite3odbc at SQLITEODBCFLAVOR@. at LIBSUFFIX@
--Database    = @GLOBUS_LOCATION@/var/lrc1000.db
-+Driver      = @libdir@/libsqlite3odbc at SQLITEODBCFLAVOR@. at LIBSUFFIX@
-+Database    = @localstatedir@/lrc1000.db
- 
- [rli1000]
--Driver      = @GLOBUS_LOCATION@/lib/libsqlite3odbc at SQLITEODBCFLAVOR@. at LIBSUFFIX@
--Database    = @GLOBUS_LOCATION@/var/rli1000.db
-+Driver      = @libdir@/libsqlite3odbc at SQLITEODBCFLAVOR@. at LIBSUFFIX@
-+Database    = @localstatedir@/rli1000.db
- 
- [lrc1000_psql]
--Driver      = @GLOBUS_LOCATION@/lib/psqlodbc. at LIBSUFFIX@
-+Driver      = @libdir@/psqlodbc. at LIBSUFFIX@
- Database    = lrc1000
- Servername  = localhost
- Port        = 5432
- 
- [rli1000_psql]
--Driver      = @GLOBUS_LOCATION@/lib/psqlodbc. at LIBSUFFIX@
-+Driver      = @libdir@/psqlodbc. at LIBSUFFIX@
- Database    = rli1000
- Servername  = localhost
- Port        = 5432
-+
-+[lrc1000_mysql]
-+Driver      = @libdir@/libmyodbc3_r. at LIBSUFFIX@
-+Database    = lrc1000
-+
-+[rli1000_mysql]
-+Driver      = @libdir@/libmyodbc3_r. at LIBSUFFIX@
-+Database    = rli1000
-diff -ur globus_rls_server_setup-4.4.orig/pkgdata/pkg_data_src.gpt.in globus_rls_server_setup-4.4/pkgdata/pkg_data_src.gpt.in
---- globus_rls_server_setup-4.4.orig/pkgdata/pkg_data_src.gpt.in	2007-06-14 09:56:07.000000000 +0200
-+++ globus_rls_server_setup-4.4/pkgdata/pkg_data_src.gpt.in	2008-10-25 14:34:35.000000000 +0200
-@@ -3,8 +3,7 @@
- 
- <gpt_package_metadata Name="globus_rls_server_setup" Format_Version="0.02">
-     <Aging_Version Major="4" Minor="4" Age="0"/>
--    <Description>
--    </Description>
-+    <Description>Replica Location Service Server Setup</Description>
-     <Version_Stability Release="Production"/>
-     <src_pkg>
- 
-diff -ur globus_rls_server_setup-4.4.orig/rls-ldif.conf.in globus_rls_server_setup-4.4/rls-ldif.conf.in
---- globus_rls_server_setup-4.4.orig/rls-ldif.conf.in	2002-12-22 11:37:17.000000000 +0100
-+++ globus_rls_server_setup-4.4/rls-ldif.conf.in	2008-10-25 15:16:27.000000000 +0200
-@@ -7,9 +7,9 @@
- dn: RLS=stats, Mds-Vo-name=local, o=grid
- objectclass: GlobusTop
- objectclass: GlobusActiveObject
--objectclass GlobusActiveSearch
-+objectclass: GlobusActiveSearch
- type: exec
--path: @GLOBUS_LOCATION@/libexec
-+path: @sbindir@
- base: globus-rls-reporter
- args: -d RLS=stats,Mds-Vo-name=local,o=grid rls://localhost
- cachetime: 300
-diff -ur globus_rls_server_setup-4.4.orig/setup-globus-rls-server globus_rls_server_setup-4.4/setup-globus-rls-server
---- globus_rls_server_setup-4.4.orig/setup-globus-rls-server	2007-07-02 21:13:22.000000000 +0200
-+++ globus_rls_server_setup-4.4/setup-globus-rls-server	2008-10-25 08:26:42.000000000 +0200
-@@ -1,6 +1,10 @@
- #! /bin/sh
- 
--. $GLOBUS_LOCATION/etc/globus-user-env.sh
--. $GLOBUS_LOCATION/libexec/globus-sh-tools.sh
-+if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then
-+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
-+else
-+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
-+fi
-+. ${libexecdir}/globus-sh-tools.sh
- 
--perl $GLOBUS_LOCATION/setup/globus/setup-globus-rls-server.pl
-+perl ${setupdir}/setup-globus-rls-server.pl
-diff -ur globus_rls_server_setup-4.4.orig/setup-globus-rls-server.pl globus_rls_server_setup-4.4/setup-globus-rls-server.pl
---- globus_rls_server_setup-4.4.orig/setup-globus-rls-server.pl	2007-06-14 09:48:35.000000000 +0200
-+++ globus_rls_server_setup-4.4/setup-globus-rls-server.pl	2008-10-25 10:31:15.000000000 +0200
-@@ -19,12 +19,7 @@
- 
- if (!defined($gpath))
- {
--  $gpath = $ENV{GLOBUS_LOCATION};
--}
--
--if (!defined($gpath))
--{
--   die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
-+  $gpath = "/usr";
- }
- 
- @INC = (@INC, "$gpath/lib/perl");
-@@ -33,19 +28,20 @@
- 
- my $metadata = new Grid::GPT::Setup(package_name => "globus_rls_server_setup");
- 
--my $globusdir = $ENV{GLOBUS_LOCATION};
--
--if((!defined($globusdir)))
--{
--    die "GLOBUS_LOCATION needs to be set before running this script"
--}
-+require Globus::Core::Paths;
-+my $setupdir = $Globus::Core::Paths::setupdir;
-+my $globusdir = $Globus::Core::Paths::prefix;
-+my $libdir = $Globus::Core::Paths::libdir;
-+my $localstatedir = $Globus::Core::Paths::localstatedir;
-+my $sbindir = $Globus::Core::Paths::sbindir;
-+my $sysconfdir = $Globus::Core::Paths::sysconfdir;
- 
- my $shell = $ENV{GLOBUS_SH};
- if (!defined($shell)) {
-   $shell = "/bin/sh";
- }
- 
--my $odbclib = "$globusdir/lib";
-+my $odbclib = "$libdir";
- 
- my $iodbc = $ENV{GLOBUS_IODBC_PATH};
- if (defined($iodbc)) {
-@@ -66,7 +62,7 @@
- 
- my $odbcini = $ENV{ODBCINI};
- if (!defined($odbcini)) {
--  $odbcini = "$globusdir/var/odbc.ini";
-+  $odbcini = "$localstatedir/odbc.ini";
- }
- 
- # Determine sysname
-@@ -98,14 +94,15 @@
-     $sqliteodbcflavor = "_" . @$pkgs[0]->flavor();
- }
- 
--my $setupdir = "$globusdir/setup/globus";
--
- for my $f ("SXXrls", "globus-rls-server.conf", "rls-ldif.conf", "odbc.ini") {
-   print "creating $f\n";
-   open(FIN, "<$setupdir/${f}.in") || die "Can't find $setupdir/${f}.in";
-   open(FOUT, ">$setupdir/${f}") || die "Can't open $setupdir/${f}.in";
-   while (<FIN>) {
-     s/\@GLOBUS_LOCATION\@/$globusdir/g;
-+    s/\@libdir\@/$libdir/g;
-+    s/\@localstatedir\@/$localstatedir/g;
-+    s/\@sbindir\@/$sbindir/g;
-     s/\@ODBCLIB\@/$odbclib/g;
-     s/\@ODBCINI\@/$odbcini/g;
-     s/\@SHELL\@/$shell/g;
-@@ -117,36 +114,36 @@
-   close FOUT;
- }
- 
--system("cp $setupdir/SXXrls $globusdir/sbin/.");
--system("chmod 0755 $globusdir/sbin/SXXrls");
-+system("cp $setupdir/SXXrls $sbindir");
-+system("chmod 0755 $sbindir/SXXrls");
- 
--if (-e "$globusdir/etc/globus-rls-server.conf") {
--  print "$globusdir/etc/globus-rls-server.conf already exists, not replacing with $setupdir/globus-rls-server.conf\n";
-+if (-e "$sysconfdir/globus-rls-server.conf") {
-+  print "$sysconfdir/globus-rls-server.conf already exists, not replacing with $setupdir/globus-rls-server.conf\n";
- } else {
--  system("cp $setupdir/globus-rls-server.conf $globusdir/etc/.");
--  system("chmod 0600 $globusdir/etc/globus-rls-server.conf");
-+  system("cp $setupdir/globus-rls-server.conf $sysconfdir");
-+  system("chmod 0600 $sysconfdir/globus-rls-server.conf");
- }
- 
--system("cp $setupdir/rls-ldif.conf $globusdir/etc/.");
--system("chmod 0644 $globusdir/etc/rls-ldif.conf");
-+system("cp $setupdir/rls-ldif.conf $sysconfdir");
-+system("chmod 0644 $sysconfdir/rls-ldif.conf");
- 
--if (-e "$globusdir/var/odbc.ini") {
--  print "$globusdir/var/odbc.ini already exists, not replacing with $setupdir/odbc.ini\n";
-+if (-e "$localstatedir/odbc.ini") {
-+  print "$localstatedir/odbc.ini already exists, not replacing with $setupdir/odbc.ini\n";
- } else {
--  system("cp $setupdir/odbc.ini $globusdir/var/.");
--  system("chmod 0644 $globusdir/var/odbc.ini");
-+  system("cp $setupdir/odbc.ini $localstatedir");
-+  system("chmod 0644 $localstatedir/odbc.ini");
- }
- 
--if (-e "$globusdir/var/lrc1000.db") {
--  print "$globusdir/var/lrc1000.db already exists, not recreating lrc1000 database.\n";
-+if (-e "$localstatedir/lrc1000.db") {
-+  print "$localstatedir/lrc1000.db already exists, not recreating lrc1000 database.\n";
- } else {
--  system("$globusdir/bin/sqlite3 $globusdir/var/lrc1000.db < $globusdir/setup/globus/globus-rls-lrc-sqlite.sql");
-+  system("sqlite3 $localstatedir/lrc1000.db < $setupdir/globus-rls-lrc-sqlite.sql");
- }
- 
--if (-e "$globusdir/var/rli1000.db") {
--  print "$globusdir/var/rli1000.db already exists, not recreating rli1000 database.\n";
-+if (-e "$localstatedir/rli1000.db") {
-+  print "$localstatedir/rli1000.db already exists, not recreating rli1000 database.\n";
- } else {
--  system("$globusdir/bin/sqlite3 $globusdir/var/rli1000.db < $globusdir/setup/globus/globus-rls-rli-sqlite.sql");
-+  system("sqlite3 $localstatedir/rli1000.db < $setupdir/globus-rls-rli-sqlite.sql");
- }
- 
- print "Done\n";
-diff -ur globus_rls_server_setup-4.4.orig/SXXrls.in globus_rls_server_setup-4.4/SXXrls.in
---- globus_rls_server_setup-4.4.orig/SXXrls.in	2006-06-09 00:30:32.000000000 +0200
-+++ globus_rls_server_setup-4.4/SXXrls.in	2008-10-25 09:27:42.000000000 +0200
-@@ -5,7 +5,11 @@
- 
- export GLOBUS_LOCATION
- 
--. ${GLOBUS_LOCATION}/libexec/globus-script-initializer
-+if test -f "${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer" ; then
-+    . ${GLOBUS_LOCATION:-/usr}/share/globus/globus-script-initializer
-+else
-+    . ${GLOBUS_LOCATION:-/usr}/libexec/globus-script-initializer
-+fi
+diff -ur globus_rls_server_setup-4.5.orig/setup-globus-rls-server globus_rls_server_setup-4.5/setup-globus-rls-server
+--- globus_rls_server_setup-4.5.orig/setup-globus-rls-server	2009-10-30 03:45:48.000000000 +0100
++++ globus_rls_server_setup-4.5/setup-globus-rls-server	2010-01-23 12:45:22.250530487 +0100
+@@ -7,4 +7,4 @@
+ fi
  . ${libexecdir}/globus-sh-tools.sh
  
- case "$1" in
-@@ -14,7 +18,7 @@
- 
-     echo "Starting up RLS server"
- 
--    if [ "$ODBCLIB" != "$GLOBUS_LOCATION" ]; then
-+    if [ "$ODBCLIB" != "${libdir}" ]; then
-       if [ -d ${ODBCLIB} ]; then
-         if [ "X$LD_LIBRARY_PATH" = "X" ]; then
-           LD_LIBRARY_PATH=${ODBCLIB}
-@@ -25,7 +29,7 @@
-       fi
-     fi
- 
--    ${bindir}/globus-rls-server
-+    ${sbindir}/globus-rls-server
- 
-     if [ $? -ne 0 ] ; then
-       echo "Failed to start up RLS server"
+-perl ${prefix}/setup/globus/setup-globus-rls-server.pl
++perl ${setupdir}/setup-globus-rls-server.pl


Index: globus-rls-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-server/F-12/globus-rls-server.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-rls-server.spec	21 Aug 2009 13:40:09 -0000	1.4
+++ globus-rls-server.spec	9 Feb 2010 08:57:10 -0000	1.5
@@ -6,53 +6,45 @@
 
 Name:		globus-rls-server
 %global _name %(tr - _ <<< %{name})
-Version:	4.7
-%global setupversion 4.4
-Release:	5%{?dist}
+Version:	4.9
+%global setupversion 4.5
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Server
 
 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/replica/rls/server globus_rls_server-4.7
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rls_server-4.7
-#		tar -zcf globus_rls_server-4.7.tar.gz globus_rls_server-4.7
+#		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/replica/rls/server globus_rls_server-4.9
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rls_server-4.9
+#		tar -zcf globus_rls_server-4.9.tar.gz globus_rls_server-4.9
 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/replica/rls/setup globus_rls_server_setup-4.4
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rls_server_setup-4.4
-#		tar -zcf globus_rls_server_setup-4.4.tar.gz globus_rls_server_setup-4.4
+#		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/replica/rls/setup globus_rls_server_setup-4.5
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_rls_server_setup-4.5
+#		tar -zcf globus_rls_server_setup-4.5.tar.gz globus_rls_server_setup-4.5
 Source1:	%{_name}_setup-%{setupversion}.tar.gz
 #		init.d startup script
 Source2:	%{name}
 #		Post-install setup instructions
 Source3:	%{name}.INSTALL
-#		Some dependency fixes:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6594
-Patch0:		%{name}.patch
-#		Increase the lengths of the LFN/PFN strings:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6596
-Patch1:		%{name}-strlen.patch
 #		Dereferencing of type-punned pointers:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6607
-Patch2:		%{name}-type-punned-pointer.patch
+Patch0:		%{name}-type-punned-pointer.patch
 #		Remove hardcoding of paths:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6595
-Patch3:		%{name}-setup.patch
-#		Increase the lengths of the LFN/PFN strings:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6596
-Patch4:		%{name}-setup-strlen.patch
+Patch1:		%{name}-setup.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides:	%{name}-setup = %{setupversion}
 Requires:	globus-common
+Requires:	globus-rls-client%{?_isa} >= 5.2
 BuildRequires:	grid-packaging-tools
-BuildRequires:	globus-rls-client-devel%{?_isa} >= 5
+BuildRequires:	globus-rls-client-devel%{?_isa} >= 5.2
 BuildRequires:	globus-common-devel%{?_isa} >= 3
 BuildRequires:	globus-usage-devel%{?_isa}
 BuildRequires:	unixODBC-devel%{?_isa}
@@ -78,11 +70,8 @@ Replica Location Service Server Setup
 %setup -q -n %{_name}-%{version}
 %setup -D -T -q -n %{_name}-%{version} -a 1
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 cd %{_name}_setup-%{setupversion}
-%patch3 -p1
-%patch4 -p1
+%patch1 -p1
 cd -
 
 %build
@@ -227,6 +216,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}/INSTALL
 
 %changelog
+* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-1
+- Update to Globus Toolkit 5.0.0
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.7-5
 - rebuilt with new openssl
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-server/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jun 2009 21:13:46 -0000	1.2
+++ import.log	9 Feb 2010 08:57:10 -0000	1.3
@@ -1,2 +1,3 @@
 globus-rls-server-4_7-2_fc9:HEAD:globus-rls-server-4.7-2.fc9.src.rpm:1244258197
 globus-rls-server-4_7-3_fc9:HEAD:globus-rls-server-4.7-3.fc9.src.rpm:1245100403
+globus-rls-server-4_9-1_fc12:F-12:globus-rls-server-4.9-1.fc12.src.rpm:1265705814


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-rls-server/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	6 Jun 2009 03:19:40 -0000	1.2
+++ sources	9 Feb 2010 08:57:10 -0000	1.3
@@ -1,2 +1,2 @@
-2fa3c7592a2a990afe006038962b6048  globus_rls_server-4.7.tar.gz
-876313912bdea5f6fd3dd96b31dc5b8f  globus_rls_server_setup-4.4.tar.gz
+8b19698ab0f1fbc1b35ea0b4079bb835  globus_rls_server-4.9.tar.gz
+6952007efe4b4b95504c8667a19ebbeb  globus_rls_server_setup-4.5.tar.gz


--- globus-rls-server-setup-strlen.patch DELETED ---


--- globus-rls-server-strlen.patch DELETED ---


--- globus-rls-server.patch DELETED ---