SPECS: bacula.spec - rel 3; fix log path; add /var/log/bacula; fix...

[arekm]

Author: arekm                        Date: Sat Nov 24 22:02:18 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3; fix log path; add /var/log/bacula; fix dir post

---- Files affected:
SPECS:
   bacula.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.80 SPECS/bacula.spec:1.81
--- SPECS/bacula.spec:1.80	Sat Nov 24 22:25:16 2007
+++ SPECS/bacula.spec	Sat Nov 24 23:02:13 2007
@@ -42,7 +42,7 @@
 Summary(pl.UTF-8):	Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:		bacula
 Version:	2.2.6
-Release:	2
+Release:	3
 Epoch:		0
 License:	extended GPL v2
 Group:		Networking/Utilities
@@ -64,6 +64,7 @@
 Patch2:		%{name}-mysql.patch
 Patch3:		%{name}-tinfo-readline.patch
 Patch4:		%{name}-branding.patch
+Patch5:		%{name}-conf.patch
 URL:		http://www.bacula.org/
 BuildRequires:	acl-static
 BuildRequires:	automake
@@ -438,6 +439,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -502,7 +504,7 @@
 
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rescue
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_mandir},%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_mandir},%{_bindir},/var/log/bacula}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -545,6 +547,8 @@
 install rescue/linux/floppy/sfdisk.bz2 $RPM_BUILD_ROOT%{_sysconfdir}/rescue
 %endif
 
+touch $RPM_BUILD_ROOT/var/log/bacula/log
+
 # install the updatedb scripts
 install updatedb/update_sqlite* $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
@@ -595,7 +599,7 @@
 # XXX: Most of this upgrade procedure is safe for sqlite only. Other databases would require knowledge
 #      about currently used version so we can't easily support these :(
 
-if %{with sqlite} || %{with sqlite3}
+%if %{with sqlite} || %{with sqlite3}
 [ -s %{_localstatedir}/bacula.db ] && \
 	DB_VER=`echo "select * from Version;" | \
 	%{_bindir}/sqlite%{?with_sqlite3:3} %{_localstatedir}/bacula.db | tail -n 1 2>/dev/null`
@@ -767,6 +771,8 @@
 %{_libexecdir}/%{name}/btraceback.dbx
 %{_libexecdir}/%{name}/btraceback.gdb
 %attr(770,root,bacula) %dir %{_localstatedir}
+%attr(750,bacula,logs) %dir /var/log/bacula
+%attr(640,bacula,logs) %ghost /var/log/bacula/log
 
 %files dir
 %defattr(644,root,root,755)
@@ -931,6 +937,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2007-11-24 22:02:13  arekm
+- rel 3; fix log path; add /var/log/bacula; fix dir post
+
 Revision 1.80  2007-11-24 21:25:16  arekm
 bacula-dir.conf needs to be root:bacula for reload console command to work
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bacula.spec?r1=1.80&r2=1.81&f=u