rpms/bacula/devel bacula.spec,1.11,1.12

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13916

Modified Files:
	bacula.spec 
Log Message:
Probable fix for BZ 458432.



Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bacula.spec	31 Jul 2008 18:20:33 -0000	1.11
+++ bacula.spec	10 Sep 2008 14:31:29 -0000	1.12
@@ -9,7 +9,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -620,16 +620,21 @@
 
 
 %preun director-mysql
-/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.mysql
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.mysql
+fi
 
 
 %preun director-sqlite
-/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.sqlite
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.sqlite
+fi
 
 
 %preun director-postgresql
-/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.postgresql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.postgresql
+fi
 
 %pre common
 /usr/sbin/fedora-groupadd 33 -r bacula &>/dev/null || :
@@ -658,23 +663,26 @@
 
 
 %preun storage-mysql
-/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.mysql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.mysql
+fi
 
 %preun storage-sqlite
-/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.sqlite
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.sqlite
+fi
 
 %preun storage-postgresql
-/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.postgresql
-
+if [ "$1" = 0 ]; then
+	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.postgresql
+fi
 
 %post client
 /sbin/chkconfig --add bacula-fd
 
 
 %preun client
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
 	/sbin/service bacula-fd stop >/dev/null 2>&1 || :
 	/sbin/chkconfig --del bacula-fd
 fi
@@ -691,7 +699,7 @@
 
 
 %preun director-common
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
 	/sbin/service bacula-dir stop >/dev/null 2>&1 || :
 	/sbin/chkconfig --del bacula-dir
 fi
@@ -708,7 +716,7 @@
 
 
 %preun storage-common
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
 	/sbin/service bacula-sd stop >/dev/null 2>&1 || :
 	/sbin/chkconfig --del bacula-sd
 fi
@@ -922,6 +930,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-2
+- Logrotate fix. BZ 457894.
+- Alternatives fix. BZ 458432.
+
 * Thu Jul 31 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-1
 - Update to 2.4.2.