[globus-rls-server/el4] Update start-up script and configuration

[Mattias Ellert]

commit 5b8b76150515bd77d4bee2e9c2b57a703136f613
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Oct 6 01:36:32 2011 +0200

    Update start-up script and configuration

 globus-rls-server          |   11 +++++++++++
 globus-rls-server-db.patch |   27 ---------------------------
 globus-rls-server.spec     |   19 ++++++++++++++++++-
 3 files changed, 29 insertions(+), 28 deletions(-)
---
diff --git a/globus-rls-server b/globus-rls-server
index 93d5d0d..7726a6c 100644
--- a/globus-rls-server
+++ b/globus-rls-server
@@ -9,6 +9,17 @@
 # config: /etc/globus-rls-server.conf
 # pidfile: /var/run/globus-rls-server.pid
 
+### BEGIN INIT INFO
+# Provides:          globus-rls-server
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Should-Start:      mysqld postgresql
+# Should-Stop:       mysqld postgresql
+# Default-Stop:      0 1 2 3 4 5 6
+# Short-Description: Globus RLS Server
+# Description:       Globus Replica Location Service Server
+### END INIT INFO
+
 # source function library
 . /etc/init.d/functions
 
diff --git a/globus-rls-server.spec b/globus-rls-server.spec
index 4387733..ff0fe65 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:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Globus Toolkit - Replica Location Service Server
 
 Group:		Applications/Internet
@@ -180,6 +180,20 @@ install -m 644 -p %{SOURCE8} \
 install -m 644 -p %{SOURCE3} \
   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.Fedora
 
+# Adapt to different versions of the mysql connector
+%if %{?fedora}%{!?fedora:0} <= 4 && %{?rhel}%{!?rhel:0} <= 4
+sed s/mysql-connector-odbc/MyODBC/ \
+  -i $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.Fedora
+sed s/libmyodbc3_r/libmyodbc/ \
+  -i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-odbc.ini \
+     $RPM_BUILD_ROOT%{_datadir}/globus/setup/odbc.ini.in
+%endif
+%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 6
+sed s/libmyodbc3_r/libmyodbc5/ \
+  -i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-odbc.ini \
+     $RPM_BUILD_ROOT%{_datadir}/globus/setup/odbc.ini.in
+%endif
+
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
     $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
@@ -222,6 +236,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}/README.Fedora
 
 %changelog
+* Sun Oct 02 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-7
+- Update start-up script and configuration
+
 * Sun Jun 05 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.9-6
 - Update to Globus Toolkit 5.0.4
 - Drop patch globus-rls-server-db.patch (fixed upstream)