Adjust single directory install, add switch to supress rescue files.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7558 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index 0a019e29255c614b8b397beb45a22687b35dd260..a5e23a75de7a802b05b716e836dfa16279d05a3a 100644 (file)
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -68,9 +68,9 @@ Prefix: %{_prefix}
 %define _sbindir /opt/bacula
 %define _subsysdir /opt/bacula/working
 %define sqlite_bindir /opt/bacula/sqlite
-%define _mandir /opt/bacula
+%define _mandir /usr/share/man
 %define sysconf_dir /opt/bacula
-%define script_dir /opt/bacula
+%define script_dir /opt/bacula/scripts
 %define working_dir /opt/bacula/working
 %define pid_dir /opt/bacula/working
 %else
@@ -271,6 +271,10 @@ Distribution: %{_dist}
 # specifically disallow gconsole if desired
 %{?nobuild_gconsole:%define gconsole 0}
 
+# specifically disallow rescue files if desired
+%define rescue 1
+%{?nobuild_rescue:%define rescue 0}
+
 # Should we build wxconsole, only wxWidgets >=2.6 is supported
 # SuSE 10 and FC4 and newer
 %define wxconsole 0
@@ -1420,6 +1424,7 @@ export QTINC=/usr/lib64/qt4/include/
 export QTLIB=/usr/lib64/qt4/
 %endif
 
+%if %{rescue}
 %configure \
         --prefix=%{_prefix} \
         --sbindir=%{_sbindir} \
@@ -1435,6 +1440,7 @@ export QTLIB=/usr/lib64/qt4/
         --enable-static-fd
 
 make
+%endif
 
 %configure \
         --prefix=%{_prefix} \
@@ -1729,6 +1735,7 @@ chmod 644 $RPM_BUILD_ROOT/etc/log.d/conf/services/bacula.conf
 %endif
 
 # install the rescue files
+%if %{rescue}
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/solaris
@@ -1744,6 +1751,7 @@ 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
+%endif
 
 # install bat since make doesn't at the moment
 %if %{bat}
@@ -1846,7 +1854,6 @@ 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}) %{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
@@ -1898,12 +1905,16 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %{_mandir}/man1/bsmtp.1.%{manpage_ext}
 %endif
 
+%if ! %{client_only} && %{rescue}
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
+%endif
+
 %if ! %{client_only} && ! %{single_dir}
 %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
 %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt
 %endif
 
-%if %{single_dir}
+%if ! %{client_only} && %{single_dir}
 %{_prefix}/doc
 %endif
 
@@ -2155,7 +2166,7 @@ fi
 %endif
 
 
-%if ! %{client_only} && %{mtx} && ! %{single_dir}
+%if ! %{client_only} && %{mtx}
 %files mtx
 %defattr(-,root,root)
 %attr(-, root, %{storage_daemon_group}) %{_sbindir}/loaderinfo
@@ -2171,28 +2182,14 @@ fi
 %{_mandir}/man1/scsieject.1.%{manpage_ext}
 %endif
 
-%if ! %{client_only} && %{mtx} && %{single_dir}
-%files mtx
-%defattr(-,root,root)
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/loaderinfo
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/mtx
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsitape
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/tapeinfo
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/nsmhack
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsieject
-%{_mandir}/man1/loaderinfo.1
-%{_mandir}/man1/mtx.1
-%{_mandir}/man1/scsitape.1
-%{_mandir}/man1/tapeinfo.1
-%{_mandir}/man1/scsieject.1
-%endif
-
 %files client
 %defattr(-,root,root)
 %attr(-, root, %{daemon_group}) %dir %{script_dir}
 %{script_dir}/bacula-ctl-fd
 /etc/init.d/bacula-fd
+%if %{rescue}
 %attr(-, root, %{daemon_group}) %{script_dir}/rescue
+%endif
 
 %if ! %{single_dir}
 %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
@@ -2432,6 +2429,9 @@ fi
 %endif
 
 %changelog
+* Sun Sep 07 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- adjust /opt/bacula install
+- add build switch to supress rescue package
 * Sun Aug 24 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add support for install to /opt/bacula
 * Sun Aug 17 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 0a019e29255c614b8b397beb45a22687b35dd260..a5e23a75de7a802b05b716e836dfa16279d05a3a 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -68,9 +68,9 @@ Prefix: %{_prefix}
 %define _sbindir /opt/bacula
 %define _subsysdir /opt/bacula/working
 %define sqlite_bindir /opt/bacula/sqlite
-%define _mandir /opt/bacula
+%define _mandir /usr/share/man
 %define sysconf_dir /opt/bacula
-%define script_dir /opt/bacula
+%define script_dir /opt/bacula/scripts
 %define working_dir /opt/bacula/working
 %define pid_dir /opt/bacula/working
 %else
@@ -271,6 +271,10 @@ Distribution: %{_dist}
 # specifically disallow gconsole if desired
 %{?nobuild_gconsole:%define gconsole 0}
 
+# specifically disallow rescue files if desired
+%define rescue 1
+%{?nobuild_rescue:%define rescue 0}
+
 # Should we build wxconsole, only wxWidgets >=2.6 is supported
 # SuSE 10 and FC4 and newer
 %define wxconsole 0
@@ -1420,6 +1424,7 @@ export QTINC=/usr/lib64/qt4/include/
 export QTLIB=/usr/lib64/qt4/
 %endif
 
+%if %{rescue}
 %configure \
         --prefix=%{_prefix} \
         --sbindir=%{_sbindir} \
@@ -1435,6 +1440,7 @@ export QTLIB=/usr/lib64/qt4/
         --enable-static-fd
 
 make
+%endif
 
 %configure \
         --prefix=%{_prefix} \
@@ -1729,6 +1735,7 @@ chmod 644 $RPM_BUILD_ROOT/etc/log.d/conf/services/bacula.conf
 %endif
 
 # install the rescue files
+%if %{rescue}
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/solaris
@@ -1744,6 +1751,7 @@ 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
+%endif
 
 # install bat since make doesn't at the moment
 %if %{bat}
@@ -1846,7 +1854,6 @@ 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}) %{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
@@ -1898,12 +1905,16 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %{_mandir}/man1/bsmtp.1.%{manpage_ext}
 %endif
 
+%if ! %{client_only} && %{rescue}
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
+%endif
+
 %if ! %{client_only} && ! %{single_dir}
 %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
 %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt
 %endif
 
-%if %{single_dir}
+%if ! %{client_only} && %{single_dir}
 %{_prefix}/doc
 %endif
 
@@ -2155,7 +2166,7 @@ fi
 %endif
 
 
-%if ! %{client_only} && %{mtx} && ! %{single_dir}
+%if ! %{client_only} && %{mtx}
 %files mtx
 %defattr(-,root,root)
 %attr(-, root, %{storage_daemon_group}) %{_sbindir}/loaderinfo
@@ -2171,28 +2182,14 @@ fi
 %{_mandir}/man1/scsieject.1.%{manpage_ext}
 %endif
 
-%if ! %{client_only} && %{mtx} && %{single_dir}
-%files mtx
-%defattr(-,root,root)
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/loaderinfo
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/mtx
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsitape
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/tapeinfo
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/nsmhack
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsieject
-%{_mandir}/man1/loaderinfo.1
-%{_mandir}/man1/mtx.1
-%{_mandir}/man1/scsitape.1
-%{_mandir}/man1/tapeinfo.1
-%{_mandir}/man1/scsieject.1
-%endif
-
 %files client
 %defattr(-,root,root)
 %attr(-, root, %{daemon_group}) %dir %{script_dir}
 %{script_dir}/bacula-ctl-fd
 /etc/init.d/bacula-fd
+%if %{rescue}
 %attr(-, root, %{daemon_group}) %{script_dir}/rescue
+%endif
 
 %if ! %{single_dir}
 %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
@@ -2432,6 +2429,9 @@ fi
 %endif
 
 %changelog
+* Sun Sep 07 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- adjust /opt/bacula install
+- add build switch to supress rescue package
 * Sun Aug 24 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add support for install to /opt/bacula
 * Sun Aug 17 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>

diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index 0a019e29255c614b8b397beb45a22687b35dd260..a5e23a75de7a802b05b716e836dfa16279d05a3a 100644 (file)
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -68,9 +68,9 @@ Prefix: %{_prefix}
 %define _sbindir /opt/bacula
 %define _subsysdir /opt/bacula/working
 %define sqlite_bindir /opt/bacula/sqlite
-%define _mandir /opt/bacula
+%define _mandir /usr/share/man
 %define sysconf_dir /opt/bacula
-%define script_dir /opt/bacula
+%define script_dir /opt/bacula/scripts
 %define working_dir /opt/bacula/working
 %define pid_dir /opt/bacula/working
 %else
@@ -271,6 +271,10 @@ Distribution: %{_dist}
 # specifically disallow gconsole if desired
 %{?nobuild_gconsole:%define gconsole 0}
 
+# specifically disallow rescue files if desired
+%define rescue 1
+%{?nobuild_rescue:%define rescue 0}
+
 # Should we build wxconsole, only wxWidgets >=2.6 is supported
 # SuSE 10 and FC4 and newer
 %define wxconsole 0
@@ -1420,6 +1424,7 @@ export QTINC=/usr/lib64/qt4/include/
 export QTLIB=/usr/lib64/qt4/
 %endif
 
+%if %{rescue}
 %configure \
         --prefix=%{_prefix} \
         --sbindir=%{_sbindir} \
@@ -1435,6 +1440,7 @@ export QTLIB=/usr/lib64/qt4/
         --enable-static-fd
 
 make
+%endif
 
 %configure \
         --prefix=%{_prefix} \
@@ -1729,6 +1735,7 @@ chmod 644 $RPM_BUILD_ROOT/etc/log.d/conf/services/bacula.conf
 %endif
 
 # install the rescue files
+%if %{rescue}
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/solaris
@@ -1744,6 +1751,7 @@ 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
+%endif
 
 # install bat since make doesn't at the moment
 %if %{bat}
@@ -1846,7 +1854,6 @@ 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}) %{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
@@ -1898,12 +1905,16 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %{_mandir}/man1/bsmtp.1.%{manpage_ext}
 %endif
 
+%if ! %{client_only} && %{rescue}
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
+%endif
+
 %if ! %{client_only} && ! %{single_dir}
 %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
 %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt
 %endif
 
-%if %{single_dir}
+%if ! %{client_only} && %{single_dir}
 %{_prefix}/doc
 %endif
 
@@ -2155,7 +2166,7 @@ fi
 %endif
 
 
-%if ! %{client_only} && %{mtx} && ! %{single_dir}
+%if ! %{client_only} && %{mtx}
 %files mtx
 %defattr(-,root,root)
 %attr(-, root, %{storage_daemon_group}) %{_sbindir}/loaderinfo
@@ -2171,28 +2182,14 @@ fi
 %{_mandir}/man1/scsieject.1.%{manpage_ext}
 %endif
 
-%if ! %{client_only} && %{mtx} && %{single_dir}
-%files mtx
-%defattr(-,root,root)
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/loaderinfo
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/mtx
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsitape
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/tapeinfo
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/nsmhack
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsieject
-%{_mandir}/man1/loaderinfo.1
-%{_mandir}/man1/mtx.1
-%{_mandir}/man1/scsitape.1
-%{_mandir}/man1/tapeinfo.1
-%{_mandir}/man1/scsieject.1
-%endif
-
 %files client
 %defattr(-,root,root)
 %attr(-, root, %{daemon_group}) %dir %{script_dir}
 %{script_dir}/bacula-ctl-fd
 /etc/init.d/bacula-fd
+%if %{rescue}
 %attr(-, root, %{daemon_group}) %{script_dir}/rescue
+%endif
 
 %if ! %{single_dir}
 %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
@@ -2432,6 +2429,9 @@ fi
 %endif
 
 %changelog
+* Sun Sep 07 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- adjust /opt/bacula install
+- add build switch to supress rescue package
 * Sun Aug 24 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add support for install to /opt/bacula
 * Sun Aug 17 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>