FHS compatibility corrections.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6702 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index f966a73891aba6450cefc245f5bfd3255ab34909..9942e4bf73826ac57fdceb2fad4f3d586d84b4ef 100644 (file)
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -5,8 +5,8 @@
 
 # basic defines for every build
 %define _version @VERSION@
-%define _release 1
-%define depkgs_version 09Sep07
+%define _release 2
+%define depkgs_version 22Feb08
 %define _rescuever @VERSION@
 %define docs_version @VERSION@
 
@@ -50,7 +50,7 @@ Packager: %{_packager}
 %define blurb8 Bacula source code has been released under the GPL version 2 license.
 
 # directory locations
-%define sqlite_bindir /usr/lib/bacula/sqlite
+%define sqlite_bindir %_libdir/bacula/sqlite
 %define _docsrc ../%{name}-docs-%{docs_version}
 %define _rescuesrc ../%{name}-rescue-%{_rescuever}
 %define depkgs ../depkgs
@@ -58,7 +58,7 @@ Packager: %{_packager}
 
 # directory locations for FHS-compatibility
 %define sysconf_dir /etc/bacula
-%define script_dir /etc/bacula
+%define script_dir %_libdir/bacula
 %define working_dir /var/lib/bacula
 %define pid_dir /var/run
 
@@ -1571,20 +1571,20 @@ chmod 644 $RPM_BUILD_ROOT/etc/log.d/conf/services/bacula.conf
 %endif
 
 # install the rescue files
-mkdir $RPM_BUILD_ROOT%{sysconf_dir}/rescue
-mkdir $RPM_BUILD_ROOT%{sysconf_dir}/rescue/freebsd
-mkdir $RPM_BUILD_ROOT%{sysconf_dir}/rescue/solaris
-cp -p %{_rescuesrc}/Makefile* $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -p %{_rescuesrc}/freebsd/Makefile* $RPM_BUILD_ROOT%{sysconf_dir}/rescue/freebsd/
-cp -p %{_rescuesrc}/solaris/Makefile* $RPM_BUILD_ROOT%{sysconf_dir}/rescue/solaris/
-cp -p %{_rescuesrc}/README $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -p %{_rescuesrc}/configure $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -p %{_rescuesrc}/version.h $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -pr %{_rescuesrc}/linux $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -pr %{_rescuesrc}/autoconf $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -pr %{_rescuesrc}/knoppix $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-touch $RPM_BUILD_ROOT%{sysconf_dir}/rescue/linux/cdrom/rpm_release
-cp -p src/filed/static-bacula-fd $RPM_BUILD_ROOT%{sysconf_dir}/rescue/linux/cdrom/bacula/bin/bacula-fd
+mkdir $RPM_BUILD_ROOT%{script_dir}/rescue
+mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd
+mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/solaris
+cp -p %{_rescuesrc}/Makefile* $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -p %{_rescuesrc}/freebsd/Makefile* $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd/
+cp -p %{_rescuesrc}/solaris/Makefile* $RPM_BUILD_ROOT%{script_dir}/rescue/solaris/
+cp -p %{_rescuesrc}/README $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -p %{_rescuesrc}/configure $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -p %{_rescuesrc}/version.h $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -pr %{_rescuesrc}/linux $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -pr %{_rescuesrc}/autoconf $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -pr %{_rescuesrc}/knoppix $RPM_BUILD_ROOT%{script_dir}/rescue/
+touch $RPM_BUILD_ROOT%{script_dir}/rescue/linux/cdrom/rpm_release
+cp -p src/filed/static-bacula-fd $RPM_BUILD_ROOT%{script_dir}/rescue/linux/cdrom/bacula/bin/bacula-fd
 rm -f src/filed/static-bacula-fd
 
 # install bat since make doesn't at the moment
@@ -1674,7 +1674,7 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %attr(-, root, %{daemon_group}) %{script_dir}/delete_catalog_backup
 %attr(-, root, %{daemon_group}) %{script_dir}/btraceback.dbx
 %attr(-, root, %{daemon_group}) %{script_dir}/btraceback.gdb
-%attr(-, root, %{daemon_group}) %{sysconf_dir}/rescue
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
 %attr(-, root, %{daemon_group}) %{script_dir}/disk-changer
 %attr(-, root, %{daemon_group}) %{script_dir}/bacula-ctl-dir
 %attr(-, root, %{daemon_group}) %{script_dir}/bacula-ctl-fd
@@ -1999,7 +1999,7 @@ fi
 %attr(-, root, %{daemon_group}) %{script_dir}/bconsole
 %{script_dir}/bacula-ctl-fd
 /etc/init.d/bacula-fd
-%attr(-, root, %{daemon_group}) %{sysconf_dir}/rescue
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
 
 %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
 %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt
@@ -2235,6 +2235,8 @@ fi
 %endif
 
 %changelog
+* Sun Mar 30 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- FHS compatibility changes
 * Sat Feb 16 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - remove fix for false buffer overflow detection with glibc >= 2.7
 * Sat Feb 09 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index f966a73891aba6450cefc245f5bfd3255ab34909..9942e4bf73826ac57fdceb2fad4f3d586d84b4ef 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -5,8 +5,8 @@
 
 # basic defines for every build
 %define _version @VERSION@
-%define _release 1
-%define depkgs_version 09Sep07
+%define _release 2
+%define depkgs_version 22Feb08
 %define _rescuever @VERSION@
 %define docs_version @VERSION@
 
@@ -50,7 +50,7 @@ Packager: %{_packager}
 %define blurb8 Bacula source code has been released under the GPL version 2 license.
 
 # directory locations
-%define sqlite_bindir /usr/lib/bacula/sqlite
+%define sqlite_bindir %_libdir/bacula/sqlite
 %define _docsrc ../%{name}-docs-%{docs_version}
 %define _rescuesrc ../%{name}-rescue-%{_rescuever}
 %define depkgs ../depkgs
@@ -58,7 +58,7 @@ Packager: %{_packager}
 
 # directory locations for FHS-compatibility
 %define sysconf_dir /etc/bacula
-%define script_dir /etc/bacula
+%define script_dir %_libdir/bacula
 %define working_dir /var/lib/bacula
 %define pid_dir /var/run
 
@@ -1571,20 +1571,20 @@ chmod 644 $RPM_BUILD_ROOT/etc/log.d/conf/services/bacula.conf
 %endif
 
 # install the rescue files
-mkdir $RPM_BUILD_ROOT%{sysconf_dir}/rescue
-mkdir $RPM_BUILD_ROOT%{sysconf_dir}/rescue/freebsd
-mkdir $RPM_BUILD_ROOT%{sysconf_dir}/rescue/solaris
-cp -p %{_rescuesrc}/Makefile* $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -p %{_rescuesrc}/freebsd/Makefile* $RPM_BUILD_ROOT%{sysconf_dir}/rescue/freebsd/
-cp -p %{_rescuesrc}/solaris/Makefile* $RPM_BUILD_ROOT%{sysconf_dir}/rescue/solaris/
-cp -p %{_rescuesrc}/README $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -p %{_rescuesrc}/configure $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -p %{_rescuesrc}/version.h $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -pr %{_rescuesrc}/linux $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -pr %{_rescuesrc}/autoconf $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -pr %{_rescuesrc}/knoppix $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-touch $RPM_BUILD_ROOT%{sysconf_dir}/rescue/linux/cdrom/rpm_release
-cp -p src/filed/static-bacula-fd $RPM_BUILD_ROOT%{sysconf_dir}/rescue/linux/cdrom/bacula/bin/bacula-fd
+mkdir $RPM_BUILD_ROOT%{script_dir}/rescue
+mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd
+mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/solaris
+cp -p %{_rescuesrc}/Makefile* $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -p %{_rescuesrc}/freebsd/Makefile* $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd/
+cp -p %{_rescuesrc}/solaris/Makefile* $RPM_BUILD_ROOT%{script_dir}/rescue/solaris/
+cp -p %{_rescuesrc}/README $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -p %{_rescuesrc}/configure $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -p %{_rescuesrc}/version.h $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -pr %{_rescuesrc}/linux $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -pr %{_rescuesrc}/autoconf $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -pr %{_rescuesrc}/knoppix $RPM_BUILD_ROOT%{script_dir}/rescue/
+touch $RPM_BUILD_ROOT%{script_dir}/rescue/linux/cdrom/rpm_release
+cp -p src/filed/static-bacula-fd $RPM_BUILD_ROOT%{script_dir}/rescue/linux/cdrom/bacula/bin/bacula-fd
 rm -f src/filed/static-bacula-fd
 
 # install bat since make doesn't at the moment
@@ -1674,7 +1674,7 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %attr(-, root, %{daemon_group}) %{script_dir}/delete_catalog_backup
 %attr(-, root, %{daemon_group}) %{script_dir}/btraceback.dbx
 %attr(-, root, %{daemon_group}) %{script_dir}/btraceback.gdb
-%attr(-, root, %{daemon_group}) %{sysconf_dir}/rescue
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
 %attr(-, root, %{daemon_group}) %{script_dir}/disk-changer
 %attr(-, root, %{daemon_group}) %{script_dir}/bacula-ctl-dir
 %attr(-, root, %{daemon_group}) %{script_dir}/bacula-ctl-fd
@@ -1999,7 +1999,7 @@ fi
 %attr(-, root, %{daemon_group}) %{script_dir}/bconsole
 %{script_dir}/bacula-ctl-fd
 /etc/init.d/bacula-fd
-%attr(-, root, %{daemon_group}) %{sysconf_dir}/rescue
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
 
 %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
 %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt
@@ -2235,6 +2235,8 @@ fi
 %endif
 
 %changelog
+* Sun Mar 30 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- FHS compatibility changes
 * Sat Feb 16 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - remove fix for false buffer overflow detection with glibc >= 2.7
 * Sat Feb 09 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>

diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index f966a73891aba6450cefc245f5bfd3255ab34909..9942e4bf73826ac57fdceb2fad4f3d586d84b4ef 100644 (file)
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -5,8 +5,8 @@
 
 # basic defines for every build
 %define _version @VERSION@
-%define _release 1
-%define depkgs_version 09Sep07
+%define _release 2
+%define depkgs_version 22Feb08
 %define _rescuever @VERSION@
 %define docs_version @VERSION@
 
@@ -50,7 +50,7 @@ Packager: %{_packager}
 %define blurb8 Bacula source code has been released under the GPL version 2 license.
 
 # directory locations
-%define sqlite_bindir /usr/lib/bacula/sqlite
+%define sqlite_bindir %_libdir/bacula/sqlite
 %define _docsrc ../%{name}-docs-%{docs_version}
 %define _rescuesrc ../%{name}-rescue-%{_rescuever}
 %define depkgs ../depkgs
@@ -58,7 +58,7 @@ Packager: %{_packager}
 
 # directory locations for FHS-compatibility
 %define sysconf_dir /etc/bacula
-%define script_dir /etc/bacula
+%define script_dir %_libdir/bacula
 %define working_dir /var/lib/bacula
 %define pid_dir /var/run
 
@@ -1571,20 +1571,20 @@ chmod 644 $RPM_BUILD_ROOT/etc/log.d/conf/services/bacula.conf
 %endif
 
 # install the rescue files
-mkdir $RPM_BUILD_ROOT%{sysconf_dir}/rescue
-mkdir $RPM_BUILD_ROOT%{sysconf_dir}/rescue/freebsd
-mkdir $RPM_BUILD_ROOT%{sysconf_dir}/rescue/solaris
-cp -p %{_rescuesrc}/Makefile* $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -p %{_rescuesrc}/freebsd/Makefile* $RPM_BUILD_ROOT%{sysconf_dir}/rescue/freebsd/
-cp -p %{_rescuesrc}/solaris/Makefile* $RPM_BUILD_ROOT%{sysconf_dir}/rescue/solaris/
-cp -p %{_rescuesrc}/README $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -p %{_rescuesrc}/configure $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -p %{_rescuesrc}/version.h $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -pr %{_rescuesrc}/linux $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -pr %{_rescuesrc}/autoconf $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-cp -pr %{_rescuesrc}/knoppix $RPM_BUILD_ROOT%{sysconf_dir}/rescue/
-touch $RPM_BUILD_ROOT%{sysconf_dir}/rescue/linux/cdrom/rpm_release
-cp -p src/filed/static-bacula-fd $RPM_BUILD_ROOT%{sysconf_dir}/rescue/linux/cdrom/bacula/bin/bacula-fd
+mkdir $RPM_BUILD_ROOT%{script_dir}/rescue
+mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd
+mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/solaris
+cp -p %{_rescuesrc}/Makefile* $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -p %{_rescuesrc}/freebsd/Makefile* $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd/
+cp -p %{_rescuesrc}/solaris/Makefile* $RPM_BUILD_ROOT%{script_dir}/rescue/solaris/
+cp -p %{_rescuesrc}/README $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -p %{_rescuesrc}/configure $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -p %{_rescuesrc}/version.h $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -pr %{_rescuesrc}/linux $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -pr %{_rescuesrc}/autoconf $RPM_BUILD_ROOT%{script_dir}/rescue/
+cp -pr %{_rescuesrc}/knoppix $RPM_BUILD_ROOT%{script_dir}/rescue/
+touch $RPM_BUILD_ROOT%{script_dir}/rescue/linux/cdrom/rpm_release
+cp -p src/filed/static-bacula-fd $RPM_BUILD_ROOT%{script_dir}/rescue/linux/cdrom/bacula/bin/bacula-fd
 rm -f src/filed/static-bacula-fd
 
 # install bat since make doesn't at the moment
@@ -1674,7 +1674,7 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %attr(-, root, %{daemon_group}) %{script_dir}/delete_catalog_backup
 %attr(-, root, %{daemon_group}) %{script_dir}/btraceback.dbx
 %attr(-, root, %{daemon_group}) %{script_dir}/btraceback.gdb
-%attr(-, root, %{daemon_group}) %{sysconf_dir}/rescue
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
 %attr(-, root, %{daemon_group}) %{script_dir}/disk-changer
 %attr(-, root, %{daemon_group}) %{script_dir}/bacula-ctl-dir
 %attr(-, root, %{daemon_group}) %{script_dir}/bacula-ctl-fd
@@ -1999,7 +1999,7 @@ fi
 %attr(-, root, %{daemon_group}) %{script_dir}/bconsole
 %{script_dir}/bacula-ctl-fd
 /etc/init.d/bacula-fd
-%attr(-, root, %{daemon_group}) %{sysconf_dir}/rescue
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
 
 %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
 %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt
@@ -2235,6 +2235,8 @@ fi
 %endif
 
 %changelog
+* Sun Mar 30 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- FHS compatibility changes
 * Sat Feb 16 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - remove fix for false buffer overflow detection with glibc >= 2.7
 * Sat Feb 09 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>