Correct mysql Requires: for suse in spec file, add process status check to suse init...

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1134 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 62c7df0da7bdcbc36f9d3db99c563e379471ff75..1aa03c00885f17f85da8bd3005c6ec49cf6e35eb 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -160,10 +160,14 @@ Requires: GConf2
 Requires: linc
 Requires: libtermcap
 %endif
-%if %{mysql}
+%if %{mysql} && ! %{su9}
 Requires: mysql >= 3.23
 Requires: mysql-server >= 3.23
 %endif
+%if %{mysql} && %{su9}
+Requires: mysql >= 3.23
+Requires: mysql-client >= 3.23
+%endif
 %if %{postgresql} && %{wb3}
 Requires: rh-postgresql >= 7
 Requires: rh-postgresql-server >= 7
@@ -885,6 +889,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sat Mar 13 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+- corrected mysql prerequisites for suse
 * Mon Mar 1 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 - replaced all cp commands with cp -p
 - removed addition of a+x permissions on gnome-console

diff --git a/bacula/platforms/suse/bacula-dir.in b/bacula/platforms/suse/bacula-dir.in
index b70fac6e69b607cc3731c228cad18809f036e024..d34e668c48ac41550019aa9f8288277fc073b57e 100755 (executable)
--- a/bacula/platforms/suse/bacula-dir.in
+++ b/bacula/platforms/suse/bacula-dir.in
@@ -8,8 +8,12 @@
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 # Modified to work on SuSE 1/31/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+# Added rc.status functions 3/13/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 #
 
+# source process status functions
+# this gives us funtion rc_status -v to tell us if we succeed or fail
+. /etc/rc.status
 
 RETVAL=0
 case "$1" in
@@ -17,6 +21,7 @@ case "$1" in
        echo -n "Starting the Bacula Director: "
        /sbin/startproc @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
        RETVAL=$?
+       rc_status -v
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-dir
        ;;
@@ -24,6 +29,7 @@ case "$1" in
        echo -n "Stopping the Director daemon: "
        /sbin/killproc @sbindir@/bacula-dir
        RETVAL=$?
+       rc_status -v
        echo
        [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-dir
        ;;
@@ -34,6 +40,7 @@ case "$1" in
        ;;
     status)
        /sbin/checkproc @sbindir@/bacula-dir
+       rc_status -v
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"

diff --git a/bacula/platforms/suse/bacula-fd.in b/bacula/platforms/suse/bacula-fd.in
index 5245ecc0d3fd401624d95085e17eee4c9888d1c7..0f2c4279038451892509e2948852fd0a35f4403c 100755 (executable)
--- a/bacula/platforms/suse/bacula-fd.in
+++ b/bacula/platforms/suse/bacula-fd.in
@@ -8,14 +8,19 @@
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 # Modified to work on SuSE 1/31/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+# Added rc.status functions 3/13/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 #
 
+# source process status functions
+# this gives us funtion rc_status -v to tell us if we succeed or fail
+. /etc/rc.status
 
 case "$1" in
     start)
        echo -n "Starting the Bacula File daemon: "
        /sbin/startproc @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf
        RETVAL=$?
+       rc_status -v
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-fd
        ;;
@@ -23,6 +28,7 @@ case "$1" in
        echo -n "Stopping the Bacula File daemon: "
        /sbin/killproc @sbindir@/bacula-fd
        RETVAL=$?
+       rc_status -v
        echo
        [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-fd
        ;;
@@ -33,6 +39,7 @@ case "$1" in
        ;;
     status)
        /sbin/checkproc @sbindir@/bacula-fd
+       rc_status -v
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"

diff --git a/bacula/platforms/suse/bacula-sd.in b/bacula/platforms/suse/bacula-sd.in
index ad926d96c0476ca4651abadad37d2a1556b9831c..3924137cc7d9b6ae8f6e6ed3f93fa96b5032a5c3 100755 (executable)
--- a/bacula/platforms/suse/bacula-sd.in
+++ b/bacula/platforms/suse/bacula-sd.in
@@ -8,14 +8,19 @@
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 # Modified to work on SuSE 1/31/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+# Added rc.status functions 3/13/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 #
 
+# source process status functions
+# this gives us funtion rc_status -v to tell us if we succeed or fail
+. /etc/rc.status
 
 case "$1" in
     start)
        echo -n "Starting the Bacula Storage daemon: "
        /sbin/startproc @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf
        RETVAL=$?
+       rc_status -v
        echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-sd
        ;;
@@ -23,6 +28,7 @@ case "$1" in
        echo -n "Stopping the Bacula Storage daemon: "
        /sbin/killproc @sbindir@/bacula-sd
        RETVAL=$?
+       rc_status -v
        echo
        [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-sd
        ;;
@@ -33,6 +39,7 @@ case "$1" in
        ;;
     status)
        /sbin/checkproc @sbindir@/bacula-sd
+       rc_status -v
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"

diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index 62c7df0da7bdcbc36f9d3db99c563e379471ff75..1aa03c00885f17f85da8bd3005c6ec49cf6e35eb 100644 (file)
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -160,10 +160,14 @@ Requires: GConf2
 Requires: linc
 Requires: libtermcap
 %endif
-%if %{mysql}
+%if %{mysql} && ! %{su9}
 Requires: mysql >= 3.23
 Requires: mysql-server >= 3.23
 %endif
+%if %{mysql} && %{su9}
+Requires: mysql >= 3.23
+Requires: mysql-client >= 3.23
+%endif
 %if %{postgresql} && %{wb3}
 Requires: rh-postgresql >= 7
 Requires: rh-postgresql-server >= 7
@@ -885,6 +889,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sat Mar 13 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+- corrected mysql prerequisites for suse
 * Mon Mar 1 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 - replaced all cp commands with cp -p
 - removed addition of a+x permissions on gnome-console