From b3eca85ffb3ef255115f948e46c208f00588d4d3 Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sun, 6 Aug 2006 20:12:45 +0000 Subject: [PATCH] Update for 1.39.18 Mandriva build. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3262 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/platforms/mandrake/bacula.spec.in | 57 ++++++++++++++---------- bacula/platforms/redhat/bacula.spec.in | 57 ++++++++++++++---------- bacula/platforms/suse/bacula.spec.in | 57 ++++++++++++++---------- bacula/technotes-1.39 | 5 ++- 4 files changed, 103 insertions(+), 73 deletions(-) diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index 23cc7a6435..f1bd685ed1 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -215,6 +215,13 @@ Distribution: %{_dist} %define python 0 %{?build_python:%define python 1} +# Mandriva somehow forces the manpage file extension to bz2 rather than gz +%if %{mdk} +%define manpage_ext bz2 +%else +%define manpage_ext gz +%endif + # for client only build %if %{client_only} %define mysql 0 @@ -1233,19 +1240,19 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb /usr/sbin/bsmtp /usr/sbin/bregex /usr/sbin/bwild -%{_mandir}/man8/bacula-fd.8.gz -%{_mandir}/man8/bacula-dir.8.gz -%{_mandir}/man8/bacula-sd.8.gz -%{_mandir}/man8/bacula.8.gz -%{_mandir}/man8/bconsole.8.gz -%{_mandir}/man8/bcopy.8.gz -%{_mandir}/man8/bextract.8.gz -%{_mandir}/man8/bls.8.gz -%{_mandir}/man8/bscan.8.gz -%{_mandir}/man8/btape.8.gz -%{_mandir}/man8/btraceback.8.gz -%{_mandir}/man8/dbcheck.8.gz -%{_mandir}/man1/bsmtp.1.gz +%{_mandir}/man8/bacula-fd.8.%{manpage_ext} +%{_mandir}/man8/bacula-dir.8.%{manpage_ext} +%{_mandir}/man8/bacula-sd.8.%{manpage_ext} +%{_mandir}/man8/bacula.8.%{manpage_ext} +%{_mandir}/man8/bconsole.8.%{manpage_ext} +%{_mandir}/man8/bcopy.8.%{manpage_ext} +%{_mandir}/man8/bextract.8.%{manpage_ext} +%{_mandir}/man8/bls.8.%{manpage_ext} +%{_mandir}/man8/bscan.8.%{manpage_ext} +%{_mandir}/man8/btape.8.%{manpage_ext} +%{_mandir}/man8/btraceback.8.%{manpage_ext} +%{_mandir}/man8/dbcheck.8.%{manpage_ext} +%{_mandir}/man1/bsmtp.1.%{manpage_ext} %endif %if %{mysql} @@ -1478,10 +1485,10 @@ fi %attr(-, root, %{storage_daemon_group}) /usr/sbin/mtx %attr(-, root, %{storage_daemon_group}) /usr/sbin/scsitape %attr(-, root, %{storage_daemon_group}) /usr/sbin/tapeinfo -%{_mandir}/man1/loaderinfo.1.gz -%{_mandir}/man1/mtx.1.gz -%{_mandir}/man1/scsitape.1.gz -%{_mandir}/man1/tapeinfo.1.gz +%{_mandir}/man1/loaderinfo.1.%{manpage_ext} +%{_mandir}/man1/mtx.1.%{manpage_ext} +%{_mandir}/man1/scsitape.1.%{manpage_ext} +%{_mandir}/man1/tapeinfo.1.%{manpage_ext} %endif @@ -1507,10 +1514,10 @@ fi %attr(-, root, %{daemon_group}) /etc/bacula/btraceback.gdb %attr(-, root, %{daemon_group}) /etc/bacula/btraceback.dbx /usr/sbin/bconsole -%{_mandir}/man8/bacula-fd.8.gz -%{_mandir}/man8/bacula.8.gz -%{_mandir}/man8/bconsole.8.gz -%{_mandir}/man8/btraceback.8.gz +%{_mandir}/man8/bacula-fd.8.%{manpage_ext} +%{_mandir}/man8/bacula.8.%{manpage_ext} +%{_mandir}/man8/bconsole.8.%{manpage_ext} +%{_mandir}/man8/btraceback.8.%{manpage_ext} %pre client @@ -1590,7 +1597,7 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/gnome-console.conf /usr/share/pixmaps/bacula.png /usr/share/applications/bacula.desktop -%{_mandir}/man1/bacula-console-gnome.1.gz +%{_mandir}/man1/bacula-console-gnome.1.%{manpage_ext} %endif %if %{gconsole} && ! %{rh8} @@ -1598,7 +1605,7 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" %config(noreplace) /etc/bacula/tray-monitor.conf /usr/share/pixmaps/bacula-tray-monitor.xpm /usr/share/applications/bacula-tray-monitor.desktop -%{_mandir}/man1/bacula-tray-monitor.1.gz +%{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif %if %{gconsole} && ! %{su9} && ! %{su10} @@ -1643,7 +1650,7 @@ fi %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/wxconsole.conf /usr/share/pixmaps/wxwin16x16.xpm /usr/share/applications/wxconsole.desktop -%{_mandir}/man1/bacula-wxconsole.1.gz +%{_mandir}/man1/bacula-wxconsole.1.%{manpage_ext} %endif %if %{wxconsole} && ! %{su9} && ! %{su10} @@ -1681,6 +1688,8 @@ fi %endif %changelog +* Sun Aug 06 2006 D. Scott Barninger +- fix manpages file extension for mdk * Sat Aug 05 2006 D. Scott Barninger - bug 648 re-enable and update sqlite patches - 1.39.18 changes diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index 23cc7a6435..f1bd685ed1 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -215,6 +215,13 @@ Distribution: %{_dist} %define python 0 %{?build_python:%define python 1} +# Mandriva somehow forces the manpage file extension to bz2 rather than gz +%if %{mdk} +%define manpage_ext bz2 +%else +%define manpage_ext gz +%endif + # for client only build %if %{client_only} %define mysql 0 @@ -1233,19 +1240,19 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb /usr/sbin/bsmtp /usr/sbin/bregex /usr/sbin/bwild -%{_mandir}/man8/bacula-fd.8.gz -%{_mandir}/man8/bacula-dir.8.gz -%{_mandir}/man8/bacula-sd.8.gz -%{_mandir}/man8/bacula.8.gz -%{_mandir}/man8/bconsole.8.gz -%{_mandir}/man8/bcopy.8.gz -%{_mandir}/man8/bextract.8.gz -%{_mandir}/man8/bls.8.gz -%{_mandir}/man8/bscan.8.gz -%{_mandir}/man8/btape.8.gz -%{_mandir}/man8/btraceback.8.gz -%{_mandir}/man8/dbcheck.8.gz -%{_mandir}/man1/bsmtp.1.gz +%{_mandir}/man8/bacula-fd.8.%{manpage_ext} +%{_mandir}/man8/bacula-dir.8.%{manpage_ext} +%{_mandir}/man8/bacula-sd.8.%{manpage_ext} +%{_mandir}/man8/bacula.8.%{manpage_ext} +%{_mandir}/man8/bconsole.8.%{manpage_ext} +%{_mandir}/man8/bcopy.8.%{manpage_ext} +%{_mandir}/man8/bextract.8.%{manpage_ext} +%{_mandir}/man8/bls.8.%{manpage_ext} +%{_mandir}/man8/bscan.8.%{manpage_ext} +%{_mandir}/man8/btape.8.%{manpage_ext} +%{_mandir}/man8/btraceback.8.%{manpage_ext} +%{_mandir}/man8/dbcheck.8.%{manpage_ext} +%{_mandir}/man1/bsmtp.1.%{manpage_ext} %endif %if %{mysql} @@ -1478,10 +1485,10 @@ fi %attr(-, root, %{storage_daemon_group}) /usr/sbin/mtx %attr(-, root, %{storage_daemon_group}) /usr/sbin/scsitape %attr(-, root, %{storage_daemon_group}) /usr/sbin/tapeinfo -%{_mandir}/man1/loaderinfo.1.gz -%{_mandir}/man1/mtx.1.gz -%{_mandir}/man1/scsitape.1.gz -%{_mandir}/man1/tapeinfo.1.gz +%{_mandir}/man1/loaderinfo.1.%{manpage_ext} +%{_mandir}/man1/mtx.1.%{manpage_ext} +%{_mandir}/man1/scsitape.1.%{manpage_ext} +%{_mandir}/man1/tapeinfo.1.%{manpage_ext} %endif @@ -1507,10 +1514,10 @@ fi %attr(-, root, %{daemon_group}) /etc/bacula/btraceback.gdb %attr(-, root, %{daemon_group}) /etc/bacula/btraceback.dbx /usr/sbin/bconsole -%{_mandir}/man8/bacula-fd.8.gz -%{_mandir}/man8/bacula.8.gz -%{_mandir}/man8/bconsole.8.gz -%{_mandir}/man8/btraceback.8.gz +%{_mandir}/man8/bacula-fd.8.%{manpage_ext} +%{_mandir}/man8/bacula.8.%{manpage_ext} +%{_mandir}/man8/bconsole.8.%{manpage_ext} +%{_mandir}/man8/btraceback.8.%{manpage_ext} %pre client @@ -1590,7 +1597,7 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/gnome-console.conf /usr/share/pixmaps/bacula.png /usr/share/applications/bacula.desktop -%{_mandir}/man1/bacula-console-gnome.1.gz +%{_mandir}/man1/bacula-console-gnome.1.%{manpage_ext} %endif %if %{gconsole} && ! %{rh8} @@ -1598,7 +1605,7 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" %config(noreplace) /etc/bacula/tray-monitor.conf /usr/share/pixmaps/bacula-tray-monitor.xpm /usr/share/applications/bacula-tray-monitor.desktop -%{_mandir}/man1/bacula-tray-monitor.1.gz +%{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif %if %{gconsole} && ! %{su9} && ! %{su10} @@ -1643,7 +1650,7 @@ fi %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/wxconsole.conf /usr/share/pixmaps/wxwin16x16.xpm /usr/share/applications/wxconsole.desktop -%{_mandir}/man1/bacula-wxconsole.1.gz +%{_mandir}/man1/bacula-wxconsole.1.%{manpage_ext} %endif %if %{wxconsole} && ! %{su9} && ! %{su10} @@ -1681,6 +1688,8 @@ fi %endif %changelog +* Sun Aug 06 2006 D. Scott Barninger +- fix manpages file extension for mdk * Sat Aug 05 2006 D. Scott Barninger - bug 648 re-enable and update sqlite patches - 1.39.18 changes diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index 23cc7a6435..f1bd685ed1 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -215,6 +215,13 @@ Distribution: %{_dist} %define python 0 %{?build_python:%define python 1} +# Mandriva somehow forces the manpage file extension to bz2 rather than gz +%if %{mdk} +%define manpage_ext bz2 +%else +%define manpage_ext gz +%endif + # for client only build %if %{client_only} %define mysql 0 @@ -1233,19 +1240,19 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb /usr/sbin/bsmtp /usr/sbin/bregex /usr/sbin/bwild -%{_mandir}/man8/bacula-fd.8.gz -%{_mandir}/man8/bacula-dir.8.gz -%{_mandir}/man8/bacula-sd.8.gz -%{_mandir}/man8/bacula.8.gz -%{_mandir}/man8/bconsole.8.gz -%{_mandir}/man8/bcopy.8.gz -%{_mandir}/man8/bextract.8.gz -%{_mandir}/man8/bls.8.gz -%{_mandir}/man8/bscan.8.gz -%{_mandir}/man8/btape.8.gz -%{_mandir}/man8/btraceback.8.gz -%{_mandir}/man8/dbcheck.8.gz -%{_mandir}/man1/bsmtp.1.gz +%{_mandir}/man8/bacula-fd.8.%{manpage_ext} +%{_mandir}/man8/bacula-dir.8.%{manpage_ext} +%{_mandir}/man8/bacula-sd.8.%{manpage_ext} +%{_mandir}/man8/bacula.8.%{manpage_ext} +%{_mandir}/man8/bconsole.8.%{manpage_ext} +%{_mandir}/man8/bcopy.8.%{manpage_ext} +%{_mandir}/man8/bextract.8.%{manpage_ext} +%{_mandir}/man8/bls.8.%{manpage_ext} +%{_mandir}/man8/bscan.8.%{manpage_ext} +%{_mandir}/man8/btape.8.%{manpage_ext} +%{_mandir}/man8/btraceback.8.%{manpage_ext} +%{_mandir}/man8/dbcheck.8.%{manpage_ext} +%{_mandir}/man1/bsmtp.1.%{manpage_ext} %endif %if %{mysql} @@ -1478,10 +1485,10 @@ fi %attr(-, root, %{storage_daemon_group}) /usr/sbin/mtx %attr(-, root, %{storage_daemon_group}) /usr/sbin/scsitape %attr(-, root, %{storage_daemon_group}) /usr/sbin/tapeinfo -%{_mandir}/man1/loaderinfo.1.gz -%{_mandir}/man1/mtx.1.gz -%{_mandir}/man1/scsitape.1.gz -%{_mandir}/man1/tapeinfo.1.gz +%{_mandir}/man1/loaderinfo.1.%{manpage_ext} +%{_mandir}/man1/mtx.1.%{manpage_ext} +%{_mandir}/man1/scsitape.1.%{manpage_ext} +%{_mandir}/man1/tapeinfo.1.%{manpage_ext} %endif @@ -1507,10 +1514,10 @@ fi %attr(-, root, %{daemon_group}) /etc/bacula/btraceback.gdb %attr(-, root, %{daemon_group}) /etc/bacula/btraceback.dbx /usr/sbin/bconsole -%{_mandir}/man8/bacula-fd.8.gz -%{_mandir}/man8/bacula.8.gz -%{_mandir}/man8/bconsole.8.gz -%{_mandir}/man8/btraceback.8.gz +%{_mandir}/man8/bacula-fd.8.%{manpage_ext} +%{_mandir}/man8/bacula.8.%{manpage_ext} +%{_mandir}/man8/bconsole.8.%{manpage_ext} +%{_mandir}/man8/btraceback.8.%{manpage_ext} %pre client @@ -1590,7 +1597,7 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/gnome-console.conf /usr/share/pixmaps/bacula.png /usr/share/applications/bacula.desktop -%{_mandir}/man1/bacula-console-gnome.1.gz +%{_mandir}/man1/bacula-console-gnome.1.%{manpage_ext} %endif %if %{gconsole} && ! %{rh8} @@ -1598,7 +1605,7 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" %config(noreplace) /etc/bacula/tray-monitor.conf /usr/share/pixmaps/bacula-tray-monitor.xpm /usr/share/applications/bacula-tray-monitor.desktop -%{_mandir}/man1/bacula-tray-monitor.1.gz +%{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif %if %{gconsole} && ! %{su9} && ! %{su10} @@ -1643,7 +1650,7 @@ fi %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/wxconsole.conf /usr/share/pixmaps/wxwin16x16.xpm /usr/share/applications/wxconsole.desktop -%{_mandir}/man1/bacula-wxconsole.1.gz +%{_mandir}/man1/bacula-wxconsole.1.%{manpage_ext} %endif %if %{wxconsole} && ! %{su9} && ! %{su10} @@ -1681,6 +1688,8 @@ fi %endif %changelog +* Sun Aug 06 2006 D. Scott Barninger +- fix manpages file extension for mdk * Sat Aug 05 2006 D. Scott Barninger - bug 648 re-enable and update sqlite patches - 1.39.18 changes diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39 index 23b7e81c55..960f7335d6 100644 --- a/bacula/technotes-1.39 +++ b/bacula/technotes-1.39 @@ -7,7 +7,10 @@ dsb Updated rpm spec for 1.39 - updatedb 9 to 10, add new man pages, fix bug 648 - update sqlite script patches, lock out gnome2console builds for platforms with gtk+ < 2.4. Updated build_rpm.sh - add remote source directory, add switch for - signing, refine file names + signing, refine file names. + Updated spec file again for Mandriva build as they have this curious + custom of silently converting all manpages to bzip2 format just before + the final packaging step. 05Aug06 rbn Fixed the Windows Makefiles so that they won't accidently try and pickup binaries for the Unix build. This allows both the Unix -- 2.39.5