More logwatch stuff, I'm afraid:
You've got
%if %{wb3} || %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{fc4}
%define logwatch_dir /etc/log.d
%else
%define logwatch_dir /etc/logwatch
%endif
but sometimes when you're using it you also prefix it with /etc, and
sometimes you don't. Also when copying from source to buildroot, you've
got the variable in the source path as well as the destination.
Patch below should fix things.
Moray.
"To err is human. To purr, feline"
--- bacula.spec.orig 2010-01-25 02:56:28.000000000 -0500
+++ bacula.spec.1 2010-01-26 07:49:47.000000000 -0500
@@ -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,10 +918,10 @@
# 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/applybacula
$RPM_BUILD_ROOT/etc/%{logwatch_dir}/scripts/shared/applybacula
+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 644 $RPM_BUILD_ROOT/etc/%{logwatch_dir}/conf/logfiles/bacula.conf
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Bacula-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bacula-devel
