From 4e2a4f00cb9384283d216d19dddaa3fae3f1af03 Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sat, 20 Jan 2007 13:14:21 +0000 Subject: [PATCH] Fix bugs 752 and 754 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4028 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/platforms/mandrake/bacula.spec.in | 12 ++++++++++-- bacula/platforms/redhat/bacula.spec.in | 12 ++++++++++-- bacula/platforms/suse/bacula.spec.in | 12 ++++++++++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index 545ada98a7..e9e67572f7 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -126,7 +126,7 @@ Packager: %{_packager} %{?build_client_only:%define client_only 1} # test for a platform definition -%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} +%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -1179,6 +1179,10 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_DIR/%{name}-docs-%{docs_version} +rm -rf $RPM_BUILD_DIR/%{name}-rescue-%{_rescuever} +rm -rf $RPM_BUILD_DIR/depkgs +rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt %if %{mysql} # MySQL specific files @@ -1256,7 +1260,7 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/logfiles/bacula.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/services/bacula.conf -%attr(-, root, %{daemon_group}) /etc/bacula/query.sql +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/query.sql %attr(-, %{storage_daemon_user}, %{daemon_group}) %dir %{working_dir} @@ -1725,6 +1729,10 @@ fi %endif %changelog +* Sat Jan 20 2007 D. Scott Barninger +- correct bug 752 +- set query.sql as config file +- correct bug 754 * Sun Jan 14 2007 D. Scott Barninger - 2.0.1 release - change determination of gcc version per patch from Marc Hennes diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index 545ada98a7..e9e67572f7 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -126,7 +126,7 @@ Packager: %{_packager} %{?build_client_only:%define client_only 1} # test for a platform definition -%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} +%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -1179,6 +1179,10 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_DIR/%{name}-docs-%{docs_version} +rm -rf $RPM_BUILD_DIR/%{name}-rescue-%{_rescuever} +rm -rf $RPM_BUILD_DIR/depkgs +rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt %if %{mysql} # MySQL specific files @@ -1256,7 +1260,7 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/logfiles/bacula.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/services/bacula.conf -%attr(-, root, %{daemon_group}) /etc/bacula/query.sql +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/query.sql %attr(-, %{storage_daemon_user}, %{daemon_group}) %dir %{working_dir} @@ -1725,6 +1729,10 @@ fi %endif %changelog +* Sat Jan 20 2007 D. Scott Barninger +- correct bug 752 +- set query.sql as config file +- correct bug 754 * Sun Jan 14 2007 D. Scott Barninger - 2.0.1 release - change determination of gcc version per patch from Marc Hennes diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index 545ada98a7..e9e67572f7 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -126,7 +126,7 @@ Packager: %{_packager} %{?build_client_only:%define client_only 1} # test for a platform definition -%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} +%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -1179,6 +1179,10 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_DIR/%{name}-docs-%{docs_version} +rm -rf $RPM_BUILD_DIR/%{name}-rescue-%{_rescuever} +rm -rf $RPM_BUILD_DIR/depkgs +rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt %if %{mysql} # MySQL specific files @@ -1256,7 +1260,7 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/logfiles/bacula.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/services/bacula.conf -%attr(-, root, %{daemon_group}) /etc/bacula/query.sql +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/query.sql %attr(-, %{storage_daemon_user}, %{daemon_group}) %dir %{working_dir} @@ -1725,6 +1729,10 @@ fi %endif %changelog +* Sat Jan 20 2007 D. Scott Barninger +- correct bug 752 +- set query.sql as config file +- correct bug 754 * Sun Jan 14 2007 D. Scott Barninger - 2.0.1 release - change determination of gcc version per patch from Marc Hennes -- 2.39.5