[globus-rls-server] Add README file Revert broken mysql change from upstream

[Mattias Ellert]

commit 21378e748118da0132b043f943f2efafa5f4fb66
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Sat Apr 30 00:58:07 2011 +0200

    Add README file
    Revert broken mysql change from upstream

 GLOBUS-RLS                 |   22 ++++++++++++++++++++++
 globus-rls-server          |    2 +-
 globus-rls-server-db.patch |   27 +++++++++++++++++++++++++++
 globus-rls-server.spec     |   21 ++++++++++++++++++---
 4 files changed, 68 insertions(+), 4 deletions(-)
---
diff --git a/GLOBUS-RLS b/GLOBUS-RLS
new file mode 100644
index 0000000..1bf0782
--- /dev/null
+++ b/GLOBUS-RLS
@@ -0,0 +1,22 @@
+This package is part of the Replica Location Service (RLS) component
+of the Globus Toolkit. For more information visit:
+
+http://www.globus.org/toolkit/docs/latest-stable/data/rls/
+
+Admin Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/rls/admin/
+
+Developer's Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/rls/developer/
+
+Release Notes:
+http://www.globus.org/toolkit/docs/latest-stable/data/rls/rn/
+
+Public Interface Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/rls/pi/
+
+Quality Profile:
+http://www.globus.org/toolkit/docs/latest-stable/data/rls/qp/
+
+Migrating Guide:
+http://www.globus.org/toolkit/docs/latest-stable/data/rls/mig/
diff --git a/globus-rls-server b/globus-rls-server
index 38d45eb..75d3b54 100644
--- a/globus-rls-server
+++ b/globus-rls-server
@@ -38,7 +38,7 @@ stop()
 	if [ -n "`pidfileofproc $GLOBUS_RLS_SERVER`" ] ; then
 	    $GLOBUS_RLS_ADMIN -q rls://localhost:$port && success || failure
 	else
-	    failure $"Stopping $prog"
+	    failure
 	fi
 	RETVAL=$?
 	[ "$RETVAL" = 0 ] && rm -f /var/lock/subsys/globus-rls-server
diff --git a/globus-rls-server-db.patch b/globus-rls-server-db.patch
new file mode 100644
index 0000000..de00514
--- /dev/null
+++ b/globus-rls-server-db.patch
@@ -0,0 +1,27 @@
+diff -ur globus_rls_server-4.9.orig/db.c globus_rls_server-4.9/db.c
+--- globus_rls_server-4.9.orig/db.c	2011-01-31 21:14:24.000000000 +0100
++++ globus_rls_server-4.9/db.c	2011-04-21 18:29:34.173537762 +0200
+@@ -159,7 +159,6 @@
+ {
+   db_handle_t	*h;
+   SQLRETURN	r;
+-  char		buf[BIGBUF];
+   int		connected = 0;
+   SWORD		len;
+   int		i;
+@@ -228,15 +227,6 @@
+ 
+   globus_mutex_unlock(&db_open_mtx);
+ 
+-  if(ismysql) {
+-    snprintf(buf, BIGBUF, "USE %s",dbname);
+-    r = SQLExecDirect(h->stmt, (SQLCHAR *) buf, SQL_NTS);
+-    if (!SQLNODATAOK(r)) {
+-      odbcerr(r, SQL_HANDLE_DBC, h->dbc, errmsg);
+-      goto error;
+-    }
+-  }
+-
+   *hp = h;
+   return GLOBUS_RLS_SUCCESS;
+ 
diff --git a/globus-rls-server.spec b/globus-rls-server.spec
index f656a72..93ddc83 100644
--- a/globus-rls-server.spec
+++ b/globus-rls-server.spec
@@ -8,7 +8,7 @@ Name:		globus-rls-server
 %global _name %(tr - _ <<< %{name})
 Version:	4.9
 %global setupversion 4.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Server
 
 Group:		Applications/Internet
@@ -32,12 +32,17 @@ Source1:	%{_name}_setup-%{setupversion}.tar.gz
 Source2:	%{name}
 #		Post-install setup instructions
 Source3:	%{name}.INSTALL
+#		README file
+Source8:	GLOBUS-RLS
 #		Dereferencing of type-punned pointers:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6607
 Patch0:		%{name}-type-punned-pointer.patch
 #		Remove hardcoding of paths:
 #		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6595
 Patch1:		%{name}-setup.patch
+#		Revert broken upstream mysql change:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7115
+Patch2:		%{name}-db.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides:	%{name}-setup = %{setupversion}
@@ -73,6 +78,7 @@ Replica Location Service Server Setup
 cd %{_name}_setup-%{setupversion}
 %patch1 -p1
 cd -
+%patch2 -p1
 
 %build
 # Remove files that should be replaced during bootstrap
@@ -170,9 +176,13 @@ install -p %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+# Install README file
+install -m 644 -p %{SOURCE8} \
+  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
+
 # Install post installation instructions
 install -m 644 -p %{SOURCE3} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/INSTALL
+  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.Fedora
 
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
@@ -205,6 +215,7 @@ fi
 %dir %{_datadir}/globus/packages/%{_name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
+%doc %{_docdir}/%{name}-%{version}/README
 %dir %{_datadir}/globus/packages/%{_name}_setup
 %{_datadir}/globus/packages/setup/%{_name}_setup
 %dir %{_datadir}/globus/aggrexec
@@ -212,9 +223,13 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/rls-ldif.conf
 %{_initrddir}/%{name}
-%doc %{_docdir}/%{name}-%{version}/INSTALL
+%doc %{_docdir}/%{name}-%{version}/README.Fedora
 
 %changelog
+* Mon Apr 25 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-5
+- Add README file
+- Revert broken mysql change from upstream
+
 * Sat Feb 26 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-4
 - Update to Globus Toolkit 5.0.3