--- /var/lib/mock/sls-1.7-i386/root/builddir/build/SPECS/bacula.spec.orig	2010-01-25 07:56:28.000000000 +0000
+++ /var/lib/mock/sls-1.7-i386/root/builddir/build/SPECS/bacula.spec.1	2010-01-26 15:04:45.000000000 +0000
@@ -359,9 +359,9 @@
 
 # distribution-specific directory for logwatch
 %if %{wb3} || %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{fc4}
-%define logwatch_dir /etc/log.d
+%define logwatch_dir log.d
 %else
-%define logwatch_dir /etc/logwatch
+%define logwatch_dir logwatch
 %endif
 
 # database defines
@@ -845,10 +845,10 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-mkdir -p $RPM_BUILD_ROOT%{logwatch_dir}/conf/logfiles
-mkdir -p $RPM_BUILD_ROOT%{logwatch_dir}/conf/services
-mkdir -p $RPM_BUILD_ROOT%{logwatch_dir}/scripts/services
-mkdir -p $RPM_BUILD_ROOT%{logwatch_dir}/scripts/shared
+mkdir -p $RPM_BUILD_ROOT/etc/%{logwatch_dir}/conf/logfiles
+mkdir -p $RPM_BUILD_ROOT/etc/%{logwatch_dir}/conf/services
+mkdir -p $RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/services
+mkdir -p $RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/shared
 mkdir -p $RPM_BUILD_ROOT%{script_dir}/updatedb
 
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
@@ -918,12 +918,12 @@
 
 # install the logwatch scripts
 %if ! %{client_only}
-cp -p scripts/%{logwatch_dir}/bacula $RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/services/bacula
-cp -p scripts/%{logwatch_dir}/applybacula $RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/shared/applybacula
-cp -p scripts/%{logwatch_dir}/logfile.bacula.conf $RPM_BUILD_ROOT/etc/%{logwatch_dir}/conf/logfiles/bacula.conf
-cp -p scripts/%{logwatch_dir}/services.bacula.conf $RPM_BUILD_ROOT/etc/%{logwatch_dir}/conf/services/bacula.conf
+cp -p scripts/logwatch/bacula $RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/services/bacula
+cp -p scripts/logwatch/applybaculadate $RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/shared/applybaculadate
+cp -p scripts/logwatch/logfile.bacula.conf $RPM_BUILD_ROOT/etc/%{logwatch_dir}/conf/logfiles/bacula.conf
+cp -p scripts/logwatch/services.bacula.conf $RPM_BUILD_ROOT/etc/%{logwatch_dir}/conf/services/bacula.conf
 chmod 755 $RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/services/bacula
-chmod 755 $RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/shared/applybacula
+chmod 755 $RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/shared/applybaculadate
 chmod 644 $RPM_BUILD_ROOT/etc/%{logwatch_dir}/conf/logfiles/bacula.conf
 chmod 644 $RPM_BUILD_ROOT/etc/%{logwatch_dir}/conf/services/bacula.conf
 %endif
@@ -1038,7 +1038,7 @@
 
 /etc/logrotate.d/bacula
 /etc/%{logwatch_dir}/scripts/services/bacula
-/etc/%{logwatch_dir}/scripts/shared/applybacula
+/etc/%{logwatch_dir}/scripts/shared/applybaculadate
 %attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bacula-dir.conf
 %attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bacula-fd.conf
 %attr(-, root, %{storage_daemon_group}) %config(noreplace) %{sysconf_dir}/bacula-sd.conf