From 5580fefcd4d6bb54efe68d78803656da947f2391 Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sun, 29 Apr 2007 13:11:37 +0000 Subject: [PATCH] Revision for name changes to gnome-console and wxconsole. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4650 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/platforms/mandrake/bacula.spec.in | 330 +++++++++--------- bacula/platforms/redhat/bacula.spec.in | 330 +++++++++--------- bacula/platforms/suse/bacula.spec.in | 330 +++++++++--------- ...gnome-console.pamd => bgnome-console.pamd} | 0 bacula/scripts/wxconsole.console_apps.in | 2 +- .../wxconsole.desktop.consolehelper.in | 2 +- bacula/scripts/wxconsole.desktop.xsu.in | 2 +- 7 files changed, 510 insertions(+), 486 deletions(-) rename bacula/scripts/{gnome-console.pamd => bgnome-console.pamd} (100%) diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index 70d0529210..8d59f0d63b 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V. +# Copyright (C) 2000-2006 Kern Sibbald # Platform Build Configuration @@ -211,24 +211,29 @@ exit 1 %endif Distribution: %{_dist} -# Should we build bgconsole, possible only if gtk= >= 2.4 available. +# Should we build gconsole, possible only if gtk= >= 2.4 available. # leaving all the BuildRequires and Requires in place below for now. -%define bgconsole 1 +%define gconsole 1 %if %{rh7} || %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{su9} -%define bgconsole 0 +%define gconsole 0 %endif %if %{mdk} && ! %{mdv} -%define bgconsole 0 +%define gconsole 0 %endif -# specifically disallow bgconsole if desired -%{?nobuild_bgconsole:%define bgconsole 0} +# specifically disallow gconsole if desired +%{?nobuild_gconsole:%define gconsole 0} -# Should we build bwxconsole, only wxWidgets >=2.6 is supported +# Should we build wxconsole, only wxWidgets >=2.6 is supported # currently only SuSE 10 and FC4/FC5 -%define bwxconsole 0 -%{?build_bwxconsole:%define bwxconsole 1} +%define wxconsole 0 +%{?build_wxconsole:%define wxconsole 1} + +# Should we build bat +# requires QT4 +%define bat 0 +%{?build_bat:%define bat 1} # should we turn on python support %define python 0 @@ -248,8 +253,8 @@ Distribution: %{_dist} %define mysql5 0 %define postgresql 0 %define sqlite 0 -%define bgconsole 0 -%define bwxconsole 0 +%define gconsole 0 +%define wxconsole 0 %endif %{expand: %%define gccver %(rpm -q --queryformat %%{version} gcc)} @@ -263,7 +268,7 @@ BuildRequires: openssl-devel BuildRequires: python, python-devel %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} %endif -%if %{bgconsole} +%if %{gconsole} BuildRequires: pkgconfig, pango-devel, atk-devel %endif %if %{rh7} @@ -274,7 +279,7 @@ BuildRequires: glibc-devel >= 2.2 BuildRequires: termcap BuildRequires: glibc-devel >= 2.3 %endif -%if %{su9} && %{bgconsole} +%if %{su9} && %{gconsole} BuildRequires: libgnome >= 2.0 BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 @@ -291,7 +296,7 @@ BuildRequires: freetype2-devel BuildRequires: termcap BuildRequires: glibc-devel >= 2.3 %endif -%if %{su10} && %{bgconsole} +%if %{su10} && %{gconsole} BuildRequires: libgnome >= 2.12 BuildRequires: gtk2-devel >= 2.8 BuildRequires: libgnomeui-devel >= 2.12 @@ -311,7 +316,7 @@ BuildRequires: libpng-devel BuildRequires: termcap BuildRequires: glibc-devel >= 2.5 %endif -%if %{su102} && %{bgconsole} +%if %{su102} && %{gconsole} BuildRequires: libgnome >= 2.16 BuildRequires: gtk2-devel >= 2.10 BuildRequires: libgnomeui-devel >= 2.16 @@ -333,7 +338,7 @@ BuildRequires: libstdc++-static-devel BuildRequires: glibc-static-devel BuildRequires: glibc-devel >= 2.3 %endif -%if %{mdk} && !%{mdv} && %{bgconsole} +%if %{mdk} && !%{mdv} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui2-devel >= 2.0 BuildRequires: libORBit2-devel @@ -344,7 +349,7 @@ BuildRequires: libbonobo-activation-devel BuildRequires: libGConf2-devel BuildRequires: freetype2-devel %endif -%if %{mdv} && %{bgconsole} +%if %{mdv} && %{gconsole} BuildRequires: gtk2-devel >= 2.8 BuildRequires: libgnomeui2-devel >= 2.10 BuildRequires: libORBit2-devel @@ -359,7 +364,7 @@ BuildRequires: freetype2-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if %{fc3} && %{bgconsole} +%if %{fc3} && %{gconsole} BuildRequires: gtk2-devel >= 2.4 BuildRequires: libgnomeui-devel >= 2.8 BuildRequires: ORBit2-devel @@ -374,7 +379,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if %{fc4} && %{bgconsole} +%if %{fc4} && %{gconsole} BuildRequires: gtk2-devel >= 2.6 BuildRequires: libgnomeui-devel >= 2.10 BuildRequires: ORBit2-devel @@ -389,7 +394,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.4 %endif -%if %{fc5} && %{bgconsole} +%if %{fc5} && %{gconsole} BuildRequires: gtk2-devel >= 2.8 BuildRequires: libgnomeui-devel >= 2.14 BuildRequires: ORBit2-devel @@ -403,7 +408,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.5 %endif -%if %{fc6} && %{bgconsole} +%if %{fc6} && %{gconsole} BuildRequires: gtk2-devel >= 2.10 BuildRequires: libgnomeui-devel >= 2.16 BuildRequires: ORBit2-devel @@ -417,7 +422,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && %{bgconsole} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: ORBit2-devel @@ -450,7 +455,7 @@ BuildRequires: rh-postgresql-devel >= 7 BuildRequires: postgresql-devel >= 7 %endif -%if %{bwxconsole} +%if %{wxconsole} BuildRequires: wxGTK-devel >= 2.6 %endif @@ -694,14 +699,14 @@ This package installs scripts for updating older versions of the bacula database. %endif -%if %{bgconsole} -%package bgconsole +%if %{gconsole} +%package gconsole Summary: Bacula - The Network Backup Solution Group: System Environment/Daemons Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd, openssl %endif -%if %{bgconsole} && %{su9} +%if %{gconsole} && %{su9} Requires: gtk2 >= 2.0 Requires: libgnome >= 2.0 Requires: libgnomeui >= 2.0 @@ -715,7 +720,7 @@ Requires: gconf2 Requires: linc Requires: freetype2 %endif -%if %{bgconsole} && %{su10} +%if %{gconsole} && %{su10} Requires: gtk2 >= 2.8 Requires: libgnome >= 2.12 Requires: libgnomeui >= 2.12 @@ -732,7 +737,7 @@ Requires: fontconfig >= 2.3 Requires: gnome-vfs2 >= 2.12 Requires: libpng %endif -%if %{bgconsole} && %{su102} +%if %{gconsole} && %{su102} Requires: gtk2 >= 2.10 Requires: libgnome >= 2.16 Requires: libgnomeui >= 2.16 @@ -749,7 +754,7 @@ Requires: fontconfig >= 2.4 Requires: gnome-vfs2 >= 2.16 Requires: libpng %endif -%if %{bgconsole} && %{mdk} && !%{mdv} +%if %{gconsole} && %{mdk} && !%{mdv} Requires: gtk2 >= 2.0 Requires: libgnomeui2 Requires: glibc >= 2.3 @@ -760,7 +765,7 @@ Requires: libbonoboui >= 2.0 Requires: GConf2 Requires: freetype2 %endif -%if %{bgconsole} && %{mdv} +%if %{gconsole} && %{mdv} Requires: gtk2 >= 2.8 Requires: libgnomeui2 Requires: glibc >= 2.3 @@ -771,7 +776,7 @@ Requires: libbonoboui >= 2.10 Requires: GConf2 Requires: freetype2 %endif -%if %{bgconsole} && %{fc3} +%if %{gconsole} && %{fc3} Requires: gtk2 >= 2.4 Requires: libgnomeui >= 2.8 Requires: glibc >= 2.3 @@ -783,7 +788,7 @@ Requires: bonobo-activation Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && %{fc4} +%if %{gconsole} && %{fc4} Requires: gtk2 >= 2.6 Requires: libgnomeui >= 2.10 Requires: glibc >= 2.3 @@ -795,7 +800,7 @@ Requires: bonobo-activation Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && %{fc5} +%if %{gconsole} && %{fc5} Requires: gtk2 >= 2.8 Requires: libgnomeui >= 2.14 Requires: glibc >= 2.4 @@ -806,7 +811,7 @@ Requires: libbonoboui >= 2.14 Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && %{fc6} +%if %{gconsole} && %{fc6} Requires: gtk2 >= 2.10 Requires: libgnomeui >= 2.16 Requires: glibc >= 2.5 @@ -817,7 +822,7 @@ Requires: libbonoboui >= 2.16 Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -830,21 +835,21 @@ Requires: GConf2 Requires: linc Requires: freetype %endif -%if %{bgconsole} && %{su9} +%if %{gconsole} && %{su9} Requires: xsu %endif -%if %{bgconsole} && %{su10} +%if %{gconsole} && %{su10} Requires: xsu %endif -%if %{bgconsole} && %{su102} +%if %{gconsole} && %{su102} Requires: xsu %endif -%if %{bgconsole} && ! %{su9} && ! %{su10} && ! %{su102} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} Requires: usermode %endif -%if %{bgconsole} -%description bgconsole +%if %{gconsole} +%description gconsole %{blurb} %{blurb2} @@ -859,39 +864,39 @@ This is the Gnome Console package. It is an add-on to the client or server packages. %endif -%if %{bwxconsole} -%package bwxconsole +%if %{wxconsole} +%package wxconsole Summary: Bacula - The Network Backup Solution Group: System Environment/Daemons Requires: wxGTK >= 2.6, libstdc++, openssl %endif -%if %{bwxconsole} && %{su10} +%if %{wxconsole} && %{su10} Requires: gtk2 >= 2.8 %endif -%if %{bwxconsole} && %{su102} +%if %{wxconsole} && %{su102} Requires: gtk2 >= 2.10 %endif -%if %{bwxconsole} && %{fc3} +%if %{wxconsole} && %{fc3} Requires: gtk2 >= 2.4 %endif -%if %{bwxconsole} && %{fc4} +%if %{wxconsole} && %{fc4} Requires: gtk2 >= 2.6 %endif -%if %{bwxconsole} && %{fc5} +%if %{wxconsole} && %{fc5} Requires: gtk2 >= 2.8 %endif -%if %{bwxconsole} && %{fc6} +%if %{wxconsole} && %{fc6} Requires: gtk2 >= 2.10 %endif -%if %{bwxconsole} -%description bwxconsole +%if %{wxconsole} +%description wxconsole %{blurb} %{blurb2} @@ -972,15 +977,15 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}" %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ --enable-client-only \ - %if %{mdk} - --disable-nls \ - %endif + %if %{mdk} + --disable-nls \ + %endif --enable-static-fd make @@ -988,15 +993,15 @@ make %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ -%if %{bgconsole} +%if %{gconsole} --enable-gnome \ %endif -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} --enable-tray-monitor \ %endif %if %{mysql} @@ -1008,16 +1013,16 @@ make %if %{postgresql} --with-postgresql \ %endif -%if %{bwxconsole} - --enable-bwx-console \ +%if %{wxconsole} + --enable-bwx-console \ %endif %if %{python} - --with-python \ + --with-python \ %endif %if %{client_only} - --enable-client-only \ + --enable-client-only \ %endif - --mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-subsys-dir=/var/lock/subsys \ --with-dir-user=%{director_daemon_user} \ --with-dir-group=%{daemon_group} \ @@ -1046,12 +1051,12 @@ mkdir -p $RPM_BUILD_ROOT/etc/log.d/conf/services mkdir -p $RPM_BUILD_ROOT/etc/log.d/scripts/services mkdir -p $RPM_BUILD_ROOT%{script_dir}/updatedb -%if %{bgconsole} || %{bwxconsole} +%if %{gconsole} || %{wxconsole} mkdir -p $RPM_BUILD_ROOT/usr/share/applications mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps %endif -%if %{bgconsole} || %{bwxconsole} +%if %{gconsole} || %{wxconsole} %define usermode_iftrick 1 %else %define usermode_iftrick 0 @@ -1070,11 +1075,11 @@ mkdir -p $RPM_BUILD_ROOT%{sqlite_bindir} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ install %if ! %{client_only} @@ -1082,10 +1087,10 @@ cd %{depkgs} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ mtx-install cd ${cwd} @@ -1093,23 +1098,26 @@ cd ${cwd} # make install in manpages installs _everything_ shotgun style # so now delete what we will not be packaging -%if ! %{bwxconsole} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-bwxconsole.1.gz +%if ! %{wxconsole} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext} %endif -%if ! %{bgconsole} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-console-gnome.1.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-tray-monitor.1.gz +%if ! %{bat} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bat.1.%{manpage_ext} +%endif +%if ! %{gconsole} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-bgnome-console.1.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif %if %{client_only} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bsmtp.1.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-dir.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-sd.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bcopy.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bextract.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bls.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bscan.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/btape.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/dbcheck.8.gz +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bsmtp.1.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-dir.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-sd.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bcopy.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bextract.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bls.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bscan.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/btape.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/dbcheck.8.%{manpage_ext} %endif # fixme - make installs the mysql scripts for sqlite build @@ -1125,9 +1133,9 @@ rm -f $RPM_BUILD_ROOT%{script_dir}/startmysql rm -f $RPM_BUILD_ROOT%{script_dir}/stopmysql %endif -# fixme - make installs bgconsole script for build without bgconsole -%if ! %{bgconsole} -rm -f $RPM_BUILD_ROOT%{script_dir}/bgconsole +# fixme - make installs gconsole script for build without gconsole +%if ! %{gconsole} +rm -f $RPM_BUILD_ROOT%{script_dir}/gconsole %endif rm -f $RPM_BUILD_ROOT/usr/sbin/static-bacula-fd @@ -1155,54 +1163,54 @@ rm -f $RPM_BUILD_ROOT/etc/init.d/bacula-sd %endif # install the menu stuff -%if %{bgconsole} && %{su9} +%if %{gconsole} && %{su9} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bgconsole} && %{su10} +%if %{gconsole} && %{su10} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bgconsole} && %{su102} +%if %{gconsole} && %{su102} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bwxconsole} && %{su10} +%if %{wxconsole} && %{su10} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm -cp -p scripts/bwxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bwxconsole.desktop +cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop %endif -%if %{bwxconsole} && %{su102} +%if %{wxconsole} && %{su102} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm -cp -p scripts/bwxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bwxconsole.desktop +cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop %endif %if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{fc5} || %{mdk} %define iftrick 1 %else %define iftrick 0 %endif -%if %{bgconsole} && %{iftrick} +%if %{gconsole} && %{iftrick} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.consolehelper $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop -cp -p scripts/gnome-console.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/gnome-console -cp -p scripts/gnome-console.pamd $RPM_BUILD_ROOT/etc/pam.d/gnome-console -ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/gnome-console +cp -p scripts/bgnome-console.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bgnome-console +cp -p scripts/bgnome-console.pamd $RPM_BUILD_ROOT/etc/pam.d/bgnome-console +ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bgnome-console %endif -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bwxconsole} && %{iftrick} +%if %{wxconsole} && %{iftrick} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm -cp -p scripts/bwxconsole.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/bwxconsole.desktop -cp -p scripts/bwxconsole.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bwxconsole -cp -p scripts/bwxconsole.pamd $RPM_BUILD_ROOT/etc/pam.d/bwxconsole -ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bwxconsole +cp -p scripts/wxconsole.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop +cp -p scripts/wxconsole.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bwx-console +cp -p scripts/wxconsole.pamd $RPM_BUILD_ROOT/etc/pam.d/bwx-console +ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bwx-console %endif # install sqlite @@ -1240,17 +1248,12 @@ 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 rm -f src/filed/static-bacula-fd -%if %{bwxconsole} -mv $RPM_BUILD_ROOT/usr/sbin/bwx-console $RPM_BUILD_ROOT/usr/sbin/bwxconsole -mv $RPM_BUILD_ROOT%{sysconf_dir}/bwx-console.conf $RPM_BUILD_ROOT%{sysconf_dir}/bwxconsole.conf -%endif - # now clean up permissions that are left broken by the install %if ! %{client_only} chmod o-r $RPM_BUILD_ROOT%{script_dir}/query.sql %endif chmod o-rwx $RPM_BUILD_ROOT%{working_dir} -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} chmod 755 $RPM_BUILD_ROOT/usr/sbin/bacula-tray-monitor chmod 644 $RPM_BUILD_ROOT%{sysconf_dir}/tray-monitor.conf %endif @@ -1408,7 +1411,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "This bacula upgrade will update a bacula database from version 9 to 10." echo "You appear to be running database version $DB_VER. You must first update" echo "your database to version 9 and then install this upgrade. The alternative" - echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" + echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" echo "catalog information, then do the upgrade. Information on updating a" echo "database older than version 9 can be found in the release notes." exit 1 @@ -1422,7 +1425,7 @@ fi %if ! %{client_only} # check for and copy %{sysconf_dir}/console.conf to bconsole.conf if [ -s %{sysconf_dir}/console.conf ];then - cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf + cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf fi # create the daemon users and groups @@ -1504,11 +1507,11 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Granting privileges for MySQL user bacula..." - %{script_dir}/grant_mysql_privileges + %{script_dir}/grant_mysql_privileges echo "Creating MySQL bacula database..." - %{script_dir}/create_mysql_database + %{script_dir}/create_mysql_database echo "Creating bacula tables..." - %{script_dir}/make_mysql_tables + %{script_dir}/make_mysql_tables # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1516,7 +1519,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." mysqldump -f --opt bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_mysql_tables + %{script_dir}/update_mysql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1532,16 +1535,16 @@ if [ -s %{working_dir}/bacula.db ]; then echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite %{working_dir}/bacula.db | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_sqlite_tables + %{script_dir}/update_sqlite_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi else # create the database and tables echo "Hmm, doesn't look like you have an existing database." echo "Creating SQLite database..." - %{script_dir}/create_sqlite_database + %{script_dir}/create_sqlite_database echo "Creating the SQLite tables..." - %{script_dir}/make_sqlite_tables + %{script_dir}/make_sqlite_tables fi %endif @@ -1554,11 +1557,11 @@ DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Creating PostgreSQL bacula database..." - %{script_dir}/create_postgresql_database + %{script_dir}/create_postgresql_database echo "Creating bacula tables..." - %{script_dir}/make_postgresql_tables + %{script_dir}/make_postgresql_tables echo "Granting privileges for PostgreSQL user bacula..." - %{script_dir}/grant_postgresql_privileges + %{script_dir}/grant_postgresql_privileges # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1566,7 +1569,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." pg_dump bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_postgresql_tables + %{script_dir}/update_postgresql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1575,7 +1578,7 @@ fi %if ! %{client_only} # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1682,7 +1685,7 @@ fi # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1719,19 +1722,19 @@ fi echo "The database update scripts were installed to %{script_dir}/updatedb" %endif -%if %{bgconsole} -%files bgconsole +%if %{gconsole} +%files gconsole %defattr(-,root,root) /usr/sbin/bgnome-console %attr(-, root, %{daemon_group}) %dir %{script_dir} -%attr(-, root, %{daemon_group}) %{script_dir}/bgconsole -%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/gnome-console.conf +%attr(-, root, %{daemon_group}) %{script_dir}/gconsole +%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bgnome-console.conf /usr/share/pixmaps/bacula.png /usr/share/applications/bacula.desktop -%{_mandir}/man1/bacula-console-gnome.1.%{manpage_ext} +%{_mandir}/man1/bacula-bgnome-console.1.%{manpage_ext} %endif -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} /usr/sbin/bacula-tray-monitor %config(noreplace) %{sysconf_dir}/tray-monitor.conf /usr/share/pixmaps/bacula-tray-monitor.xpm @@ -1739,15 +1742,15 @@ echo "The database update scripts were installed to %{script_dir}/updatedb" %{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif -%if %{bgconsole} && ! %{su9} && ! %{su10} && ! %{su102} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} # add the console helper files -%config(noreplace,missingok) /etc/pam.d/gnome-console -%config(noreplace,missingok) /etc/security/console.apps/gnome-console -/usr/bin/gnome-console +%config(noreplace,missingok) /etc/pam.d/bgnome-console +%config(noreplace,missingok) /etc/security/console.apps/bgnome-console +/usr/bin/bgnome-console %endif -%if %{bgconsole} -%pre bgconsole +%if %{gconsole} +%pre gconsole # create the daemon group HAVE_BACULA=`grep %{daemon_group} %{group_file} 2>/dev/null` if [ -z "$HAVE_BACULA" ]; then @@ -1756,10 +1759,10 @@ if [ -z "$HAVE_BACULA" ]; then echo "See the manual chapter \"Running Bacula\" for details." fi -%post bgconsole +%post gconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1773,26 +1776,26 @@ if [ -d %{sysconf_dir} ]; then fi %endif -%if %{bwxconsole} -%files bwxconsole +%if %{wxconsole} +%files wxconsole %defattr(-,root,root) -/usr/sbin/bwxconsole +/usr/sbin/bwx-console %attr(-, root, %{daemon_group}) %dir %{sysconf_dir} -%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bwxconsole.conf +%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bwx-console.conf /usr/share/pixmaps/wxwin16x16.xpm -/usr/share/applications/bwxconsole.desktop +/usr/share/applications/wxconsole.desktop %{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext} %endif -%if %{bwxconsole} && ! %{su9} && ! %{su10} && ! %{su102} +%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} # add the console helper files -%config(noreplace,missingok) /etc/pam.d/bwxconsole -%config(noreplace,missingok) /etc/security/console.apps/bwxconsole -/usr/bin/bwxconsole +%config(noreplace,missingok) /etc/pam.d/bwx-console +%config(noreplace,missingok) /etc/security/console.apps/bwx-console +/usr/bin/bwx-console %endif -%if %{bwxconsole} -%pre bwxconsole +%if %{wxconsole} +%pre wxconsole # create the daemon group HAVE_BACULA=`grep %{daemon_group} %{group_file} 2>/dev/null` if [ -z "$HAVE_BACULA" ]; then @@ -1801,10 +1804,10 @@ if [ -z "$HAVE_BACULA" ]; then echo "See the manual chapter \"Running Bacula\" for details." fi -%post bwxconsole +%post wxconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1819,6 +1822,11 @@ fi %endif %changelog +* Sun Apr 29 2007 D. Scott Barninger +- 2.1.8 +- gnome-console now bgnome-console +- wxconsole now bwx-console +- add build option for bat * Sat Apr 08 2007 D. Scott Barninger - merge Otto Mueller's patch but keep script dir set to /etc/bacula - add build tag for Scientific Linux per Jon Peatfield diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index 70d0529210..8d59f0d63b 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V. +# Copyright (C) 2000-2006 Kern Sibbald # Platform Build Configuration @@ -211,24 +211,29 @@ exit 1 %endif Distribution: %{_dist} -# Should we build bgconsole, possible only if gtk= >= 2.4 available. +# Should we build gconsole, possible only if gtk= >= 2.4 available. # leaving all the BuildRequires and Requires in place below for now. -%define bgconsole 1 +%define gconsole 1 %if %{rh7} || %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{su9} -%define bgconsole 0 +%define gconsole 0 %endif %if %{mdk} && ! %{mdv} -%define bgconsole 0 +%define gconsole 0 %endif -# specifically disallow bgconsole if desired -%{?nobuild_bgconsole:%define bgconsole 0} +# specifically disallow gconsole if desired +%{?nobuild_gconsole:%define gconsole 0} -# Should we build bwxconsole, only wxWidgets >=2.6 is supported +# Should we build wxconsole, only wxWidgets >=2.6 is supported # currently only SuSE 10 and FC4/FC5 -%define bwxconsole 0 -%{?build_bwxconsole:%define bwxconsole 1} +%define wxconsole 0 +%{?build_wxconsole:%define wxconsole 1} + +# Should we build bat +# requires QT4 +%define bat 0 +%{?build_bat:%define bat 1} # should we turn on python support %define python 0 @@ -248,8 +253,8 @@ Distribution: %{_dist} %define mysql5 0 %define postgresql 0 %define sqlite 0 -%define bgconsole 0 -%define bwxconsole 0 +%define gconsole 0 +%define wxconsole 0 %endif %{expand: %%define gccver %(rpm -q --queryformat %%{version} gcc)} @@ -263,7 +268,7 @@ BuildRequires: openssl-devel BuildRequires: python, python-devel %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} %endif -%if %{bgconsole} +%if %{gconsole} BuildRequires: pkgconfig, pango-devel, atk-devel %endif %if %{rh7} @@ -274,7 +279,7 @@ BuildRequires: glibc-devel >= 2.2 BuildRequires: termcap BuildRequires: glibc-devel >= 2.3 %endif -%if %{su9} && %{bgconsole} +%if %{su9} && %{gconsole} BuildRequires: libgnome >= 2.0 BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 @@ -291,7 +296,7 @@ BuildRequires: freetype2-devel BuildRequires: termcap BuildRequires: glibc-devel >= 2.3 %endif -%if %{su10} && %{bgconsole} +%if %{su10} && %{gconsole} BuildRequires: libgnome >= 2.12 BuildRequires: gtk2-devel >= 2.8 BuildRequires: libgnomeui-devel >= 2.12 @@ -311,7 +316,7 @@ BuildRequires: libpng-devel BuildRequires: termcap BuildRequires: glibc-devel >= 2.5 %endif -%if %{su102} && %{bgconsole} +%if %{su102} && %{gconsole} BuildRequires: libgnome >= 2.16 BuildRequires: gtk2-devel >= 2.10 BuildRequires: libgnomeui-devel >= 2.16 @@ -333,7 +338,7 @@ BuildRequires: libstdc++-static-devel BuildRequires: glibc-static-devel BuildRequires: glibc-devel >= 2.3 %endif -%if %{mdk} && !%{mdv} && %{bgconsole} +%if %{mdk} && !%{mdv} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui2-devel >= 2.0 BuildRequires: libORBit2-devel @@ -344,7 +349,7 @@ BuildRequires: libbonobo-activation-devel BuildRequires: libGConf2-devel BuildRequires: freetype2-devel %endif -%if %{mdv} && %{bgconsole} +%if %{mdv} && %{gconsole} BuildRequires: gtk2-devel >= 2.8 BuildRequires: libgnomeui2-devel >= 2.10 BuildRequires: libORBit2-devel @@ -359,7 +364,7 @@ BuildRequires: freetype2-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if %{fc3} && %{bgconsole} +%if %{fc3} && %{gconsole} BuildRequires: gtk2-devel >= 2.4 BuildRequires: libgnomeui-devel >= 2.8 BuildRequires: ORBit2-devel @@ -374,7 +379,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if %{fc4} && %{bgconsole} +%if %{fc4} && %{gconsole} BuildRequires: gtk2-devel >= 2.6 BuildRequires: libgnomeui-devel >= 2.10 BuildRequires: ORBit2-devel @@ -389,7 +394,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.4 %endif -%if %{fc5} && %{bgconsole} +%if %{fc5} && %{gconsole} BuildRequires: gtk2-devel >= 2.8 BuildRequires: libgnomeui-devel >= 2.14 BuildRequires: ORBit2-devel @@ -403,7 +408,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.5 %endif -%if %{fc6} && %{bgconsole} +%if %{fc6} && %{gconsole} BuildRequires: gtk2-devel >= 2.10 BuildRequires: libgnomeui-devel >= 2.16 BuildRequires: ORBit2-devel @@ -417,7 +422,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && %{bgconsole} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: ORBit2-devel @@ -450,7 +455,7 @@ BuildRequires: rh-postgresql-devel >= 7 BuildRequires: postgresql-devel >= 7 %endif -%if %{bwxconsole} +%if %{wxconsole} BuildRequires: wxGTK-devel >= 2.6 %endif @@ -694,14 +699,14 @@ This package installs scripts for updating older versions of the bacula database. %endif -%if %{bgconsole} -%package bgconsole +%if %{gconsole} +%package gconsole Summary: Bacula - The Network Backup Solution Group: System Environment/Daemons Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd, openssl %endif -%if %{bgconsole} && %{su9} +%if %{gconsole} && %{su9} Requires: gtk2 >= 2.0 Requires: libgnome >= 2.0 Requires: libgnomeui >= 2.0 @@ -715,7 +720,7 @@ Requires: gconf2 Requires: linc Requires: freetype2 %endif -%if %{bgconsole} && %{su10} +%if %{gconsole} && %{su10} Requires: gtk2 >= 2.8 Requires: libgnome >= 2.12 Requires: libgnomeui >= 2.12 @@ -732,7 +737,7 @@ Requires: fontconfig >= 2.3 Requires: gnome-vfs2 >= 2.12 Requires: libpng %endif -%if %{bgconsole} && %{su102} +%if %{gconsole} && %{su102} Requires: gtk2 >= 2.10 Requires: libgnome >= 2.16 Requires: libgnomeui >= 2.16 @@ -749,7 +754,7 @@ Requires: fontconfig >= 2.4 Requires: gnome-vfs2 >= 2.16 Requires: libpng %endif -%if %{bgconsole} && %{mdk} && !%{mdv} +%if %{gconsole} && %{mdk} && !%{mdv} Requires: gtk2 >= 2.0 Requires: libgnomeui2 Requires: glibc >= 2.3 @@ -760,7 +765,7 @@ Requires: libbonoboui >= 2.0 Requires: GConf2 Requires: freetype2 %endif -%if %{bgconsole} && %{mdv} +%if %{gconsole} && %{mdv} Requires: gtk2 >= 2.8 Requires: libgnomeui2 Requires: glibc >= 2.3 @@ -771,7 +776,7 @@ Requires: libbonoboui >= 2.10 Requires: GConf2 Requires: freetype2 %endif -%if %{bgconsole} && %{fc3} +%if %{gconsole} && %{fc3} Requires: gtk2 >= 2.4 Requires: libgnomeui >= 2.8 Requires: glibc >= 2.3 @@ -783,7 +788,7 @@ Requires: bonobo-activation Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && %{fc4} +%if %{gconsole} && %{fc4} Requires: gtk2 >= 2.6 Requires: libgnomeui >= 2.10 Requires: glibc >= 2.3 @@ -795,7 +800,7 @@ Requires: bonobo-activation Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && %{fc5} +%if %{gconsole} && %{fc5} Requires: gtk2 >= 2.8 Requires: libgnomeui >= 2.14 Requires: glibc >= 2.4 @@ -806,7 +811,7 @@ Requires: libbonoboui >= 2.14 Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && %{fc6} +%if %{gconsole} && %{fc6} Requires: gtk2 >= 2.10 Requires: libgnomeui >= 2.16 Requires: glibc >= 2.5 @@ -817,7 +822,7 @@ Requires: libbonoboui >= 2.16 Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -830,21 +835,21 @@ Requires: GConf2 Requires: linc Requires: freetype %endif -%if %{bgconsole} && %{su9} +%if %{gconsole} && %{su9} Requires: xsu %endif -%if %{bgconsole} && %{su10} +%if %{gconsole} && %{su10} Requires: xsu %endif -%if %{bgconsole} && %{su102} +%if %{gconsole} && %{su102} Requires: xsu %endif -%if %{bgconsole} && ! %{su9} && ! %{su10} && ! %{su102} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} Requires: usermode %endif -%if %{bgconsole} -%description bgconsole +%if %{gconsole} +%description gconsole %{blurb} %{blurb2} @@ -859,39 +864,39 @@ This is the Gnome Console package. It is an add-on to the client or server packages. %endif -%if %{bwxconsole} -%package bwxconsole +%if %{wxconsole} +%package wxconsole Summary: Bacula - The Network Backup Solution Group: System Environment/Daemons Requires: wxGTK >= 2.6, libstdc++, openssl %endif -%if %{bwxconsole} && %{su10} +%if %{wxconsole} && %{su10} Requires: gtk2 >= 2.8 %endif -%if %{bwxconsole} && %{su102} +%if %{wxconsole} && %{su102} Requires: gtk2 >= 2.10 %endif -%if %{bwxconsole} && %{fc3} +%if %{wxconsole} && %{fc3} Requires: gtk2 >= 2.4 %endif -%if %{bwxconsole} && %{fc4} +%if %{wxconsole} && %{fc4} Requires: gtk2 >= 2.6 %endif -%if %{bwxconsole} && %{fc5} +%if %{wxconsole} && %{fc5} Requires: gtk2 >= 2.8 %endif -%if %{bwxconsole} && %{fc6} +%if %{wxconsole} && %{fc6} Requires: gtk2 >= 2.10 %endif -%if %{bwxconsole} -%description bwxconsole +%if %{wxconsole} +%description wxconsole %{blurb} %{blurb2} @@ -972,15 +977,15 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}" %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ --enable-client-only \ - %if %{mdk} - --disable-nls \ - %endif + %if %{mdk} + --disable-nls \ + %endif --enable-static-fd make @@ -988,15 +993,15 @@ make %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ -%if %{bgconsole} +%if %{gconsole} --enable-gnome \ %endif -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} --enable-tray-monitor \ %endif %if %{mysql} @@ -1008,16 +1013,16 @@ make %if %{postgresql} --with-postgresql \ %endif -%if %{bwxconsole} - --enable-bwx-console \ +%if %{wxconsole} + --enable-bwx-console \ %endif %if %{python} - --with-python \ + --with-python \ %endif %if %{client_only} - --enable-client-only \ + --enable-client-only \ %endif - --mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-subsys-dir=/var/lock/subsys \ --with-dir-user=%{director_daemon_user} \ --with-dir-group=%{daemon_group} \ @@ -1046,12 +1051,12 @@ mkdir -p $RPM_BUILD_ROOT/etc/log.d/conf/services mkdir -p $RPM_BUILD_ROOT/etc/log.d/scripts/services mkdir -p $RPM_BUILD_ROOT%{script_dir}/updatedb -%if %{bgconsole} || %{bwxconsole} +%if %{gconsole} || %{wxconsole} mkdir -p $RPM_BUILD_ROOT/usr/share/applications mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps %endif -%if %{bgconsole} || %{bwxconsole} +%if %{gconsole} || %{wxconsole} %define usermode_iftrick 1 %else %define usermode_iftrick 0 @@ -1070,11 +1075,11 @@ mkdir -p $RPM_BUILD_ROOT%{sqlite_bindir} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ install %if ! %{client_only} @@ -1082,10 +1087,10 @@ cd %{depkgs} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ mtx-install cd ${cwd} @@ -1093,23 +1098,26 @@ cd ${cwd} # make install in manpages installs _everything_ shotgun style # so now delete what we will not be packaging -%if ! %{bwxconsole} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-bwxconsole.1.gz +%if ! %{wxconsole} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext} %endif -%if ! %{bgconsole} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-console-gnome.1.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-tray-monitor.1.gz +%if ! %{bat} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bat.1.%{manpage_ext} +%endif +%if ! %{gconsole} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-bgnome-console.1.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif %if %{client_only} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bsmtp.1.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-dir.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-sd.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bcopy.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bextract.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bls.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bscan.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/btape.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/dbcheck.8.gz +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bsmtp.1.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-dir.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-sd.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bcopy.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bextract.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bls.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bscan.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/btape.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/dbcheck.8.%{manpage_ext} %endif # fixme - make installs the mysql scripts for sqlite build @@ -1125,9 +1133,9 @@ rm -f $RPM_BUILD_ROOT%{script_dir}/startmysql rm -f $RPM_BUILD_ROOT%{script_dir}/stopmysql %endif -# fixme - make installs bgconsole script for build without bgconsole -%if ! %{bgconsole} -rm -f $RPM_BUILD_ROOT%{script_dir}/bgconsole +# fixme - make installs gconsole script for build without gconsole +%if ! %{gconsole} +rm -f $RPM_BUILD_ROOT%{script_dir}/gconsole %endif rm -f $RPM_BUILD_ROOT/usr/sbin/static-bacula-fd @@ -1155,54 +1163,54 @@ rm -f $RPM_BUILD_ROOT/etc/init.d/bacula-sd %endif # install the menu stuff -%if %{bgconsole} && %{su9} +%if %{gconsole} && %{su9} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bgconsole} && %{su10} +%if %{gconsole} && %{su10} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bgconsole} && %{su102} +%if %{gconsole} && %{su102} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bwxconsole} && %{su10} +%if %{wxconsole} && %{su10} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm -cp -p scripts/bwxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bwxconsole.desktop +cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop %endif -%if %{bwxconsole} && %{su102} +%if %{wxconsole} && %{su102} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm -cp -p scripts/bwxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bwxconsole.desktop +cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop %endif %if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{fc5} || %{mdk} %define iftrick 1 %else %define iftrick 0 %endif -%if %{bgconsole} && %{iftrick} +%if %{gconsole} && %{iftrick} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.consolehelper $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop -cp -p scripts/gnome-console.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/gnome-console -cp -p scripts/gnome-console.pamd $RPM_BUILD_ROOT/etc/pam.d/gnome-console -ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/gnome-console +cp -p scripts/bgnome-console.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bgnome-console +cp -p scripts/bgnome-console.pamd $RPM_BUILD_ROOT/etc/pam.d/bgnome-console +ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bgnome-console %endif -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bwxconsole} && %{iftrick} +%if %{wxconsole} && %{iftrick} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm -cp -p scripts/bwxconsole.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/bwxconsole.desktop -cp -p scripts/bwxconsole.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bwxconsole -cp -p scripts/bwxconsole.pamd $RPM_BUILD_ROOT/etc/pam.d/bwxconsole -ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bwxconsole +cp -p scripts/wxconsole.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop +cp -p scripts/wxconsole.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bwx-console +cp -p scripts/wxconsole.pamd $RPM_BUILD_ROOT/etc/pam.d/bwx-console +ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bwx-console %endif # install sqlite @@ -1240,17 +1248,12 @@ 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 rm -f src/filed/static-bacula-fd -%if %{bwxconsole} -mv $RPM_BUILD_ROOT/usr/sbin/bwx-console $RPM_BUILD_ROOT/usr/sbin/bwxconsole -mv $RPM_BUILD_ROOT%{sysconf_dir}/bwx-console.conf $RPM_BUILD_ROOT%{sysconf_dir}/bwxconsole.conf -%endif - # now clean up permissions that are left broken by the install %if ! %{client_only} chmod o-r $RPM_BUILD_ROOT%{script_dir}/query.sql %endif chmod o-rwx $RPM_BUILD_ROOT%{working_dir} -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} chmod 755 $RPM_BUILD_ROOT/usr/sbin/bacula-tray-monitor chmod 644 $RPM_BUILD_ROOT%{sysconf_dir}/tray-monitor.conf %endif @@ -1408,7 +1411,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "This bacula upgrade will update a bacula database from version 9 to 10." echo "You appear to be running database version $DB_VER. You must first update" echo "your database to version 9 and then install this upgrade. The alternative" - echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" + echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" echo "catalog information, then do the upgrade. Information on updating a" echo "database older than version 9 can be found in the release notes." exit 1 @@ -1422,7 +1425,7 @@ fi %if ! %{client_only} # check for and copy %{sysconf_dir}/console.conf to bconsole.conf if [ -s %{sysconf_dir}/console.conf ];then - cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf + cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf fi # create the daemon users and groups @@ -1504,11 +1507,11 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Granting privileges for MySQL user bacula..." - %{script_dir}/grant_mysql_privileges + %{script_dir}/grant_mysql_privileges echo "Creating MySQL bacula database..." - %{script_dir}/create_mysql_database + %{script_dir}/create_mysql_database echo "Creating bacula tables..." - %{script_dir}/make_mysql_tables + %{script_dir}/make_mysql_tables # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1516,7 +1519,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." mysqldump -f --opt bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_mysql_tables + %{script_dir}/update_mysql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1532,16 +1535,16 @@ if [ -s %{working_dir}/bacula.db ]; then echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite %{working_dir}/bacula.db | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_sqlite_tables + %{script_dir}/update_sqlite_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi else # create the database and tables echo "Hmm, doesn't look like you have an existing database." echo "Creating SQLite database..." - %{script_dir}/create_sqlite_database + %{script_dir}/create_sqlite_database echo "Creating the SQLite tables..." - %{script_dir}/make_sqlite_tables + %{script_dir}/make_sqlite_tables fi %endif @@ -1554,11 +1557,11 @@ DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Creating PostgreSQL bacula database..." - %{script_dir}/create_postgresql_database + %{script_dir}/create_postgresql_database echo "Creating bacula tables..." - %{script_dir}/make_postgresql_tables + %{script_dir}/make_postgresql_tables echo "Granting privileges for PostgreSQL user bacula..." - %{script_dir}/grant_postgresql_privileges + %{script_dir}/grant_postgresql_privileges # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1566,7 +1569,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." pg_dump bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_postgresql_tables + %{script_dir}/update_postgresql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1575,7 +1578,7 @@ fi %if ! %{client_only} # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1682,7 +1685,7 @@ fi # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1719,19 +1722,19 @@ fi echo "The database update scripts were installed to %{script_dir}/updatedb" %endif -%if %{bgconsole} -%files bgconsole +%if %{gconsole} +%files gconsole %defattr(-,root,root) /usr/sbin/bgnome-console %attr(-, root, %{daemon_group}) %dir %{script_dir} -%attr(-, root, %{daemon_group}) %{script_dir}/bgconsole -%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/gnome-console.conf +%attr(-, root, %{daemon_group}) %{script_dir}/gconsole +%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bgnome-console.conf /usr/share/pixmaps/bacula.png /usr/share/applications/bacula.desktop -%{_mandir}/man1/bacula-console-gnome.1.%{manpage_ext} +%{_mandir}/man1/bacula-bgnome-console.1.%{manpage_ext} %endif -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} /usr/sbin/bacula-tray-monitor %config(noreplace) %{sysconf_dir}/tray-monitor.conf /usr/share/pixmaps/bacula-tray-monitor.xpm @@ -1739,15 +1742,15 @@ echo "The database update scripts were installed to %{script_dir}/updatedb" %{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif -%if %{bgconsole} && ! %{su9} && ! %{su10} && ! %{su102} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} # add the console helper files -%config(noreplace,missingok) /etc/pam.d/gnome-console -%config(noreplace,missingok) /etc/security/console.apps/gnome-console -/usr/bin/gnome-console +%config(noreplace,missingok) /etc/pam.d/bgnome-console +%config(noreplace,missingok) /etc/security/console.apps/bgnome-console +/usr/bin/bgnome-console %endif -%if %{bgconsole} -%pre bgconsole +%if %{gconsole} +%pre gconsole # create the daemon group HAVE_BACULA=`grep %{daemon_group} %{group_file} 2>/dev/null` if [ -z "$HAVE_BACULA" ]; then @@ -1756,10 +1759,10 @@ if [ -z "$HAVE_BACULA" ]; then echo "See the manual chapter \"Running Bacula\" for details." fi -%post bgconsole +%post gconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1773,26 +1776,26 @@ if [ -d %{sysconf_dir} ]; then fi %endif -%if %{bwxconsole} -%files bwxconsole +%if %{wxconsole} +%files wxconsole %defattr(-,root,root) -/usr/sbin/bwxconsole +/usr/sbin/bwx-console %attr(-, root, %{daemon_group}) %dir %{sysconf_dir} -%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bwxconsole.conf +%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bwx-console.conf /usr/share/pixmaps/wxwin16x16.xpm -/usr/share/applications/bwxconsole.desktop +/usr/share/applications/wxconsole.desktop %{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext} %endif -%if %{bwxconsole} && ! %{su9} && ! %{su10} && ! %{su102} +%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} # add the console helper files -%config(noreplace,missingok) /etc/pam.d/bwxconsole -%config(noreplace,missingok) /etc/security/console.apps/bwxconsole -/usr/bin/bwxconsole +%config(noreplace,missingok) /etc/pam.d/bwx-console +%config(noreplace,missingok) /etc/security/console.apps/bwx-console +/usr/bin/bwx-console %endif -%if %{bwxconsole} -%pre bwxconsole +%if %{wxconsole} +%pre wxconsole # create the daemon group HAVE_BACULA=`grep %{daemon_group} %{group_file} 2>/dev/null` if [ -z "$HAVE_BACULA" ]; then @@ -1801,10 +1804,10 @@ if [ -z "$HAVE_BACULA" ]; then echo "See the manual chapter \"Running Bacula\" for details." fi -%post bwxconsole +%post wxconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1819,6 +1822,11 @@ fi %endif %changelog +* Sun Apr 29 2007 D. Scott Barninger +- 2.1.8 +- gnome-console now bgnome-console +- wxconsole now bwx-console +- add build option for bat * Sat Apr 08 2007 D. Scott Barninger - merge Otto Mueller's patch but keep script dir set to /etc/bacula - add build tag for Scientific Linux per Jon Peatfield diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index 70d0529210..8d59f0d63b 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V. +# Copyright (C) 2000-2006 Kern Sibbald # Platform Build Configuration @@ -211,24 +211,29 @@ exit 1 %endif Distribution: %{_dist} -# Should we build bgconsole, possible only if gtk= >= 2.4 available. +# Should we build gconsole, possible only if gtk= >= 2.4 available. # leaving all the BuildRequires and Requires in place below for now. -%define bgconsole 1 +%define gconsole 1 %if %{rh7} || %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{su9} -%define bgconsole 0 +%define gconsole 0 %endif %if %{mdk} && ! %{mdv} -%define bgconsole 0 +%define gconsole 0 %endif -# specifically disallow bgconsole if desired -%{?nobuild_bgconsole:%define bgconsole 0} +# specifically disallow gconsole if desired +%{?nobuild_gconsole:%define gconsole 0} -# Should we build bwxconsole, only wxWidgets >=2.6 is supported +# Should we build wxconsole, only wxWidgets >=2.6 is supported # currently only SuSE 10 and FC4/FC5 -%define bwxconsole 0 -%{?build_bwxconsole:%define bwxconsole 1} +%define wxconsole 0 +%{?build_wxconsole:%define wxconsole 1} + +# Should we build bat +# requires QT4 +%define bat 0 +%{?build_bat:%define bat 1} # should we turn on python support %define python 0 @@ -248,8 +253,8 @@ Distribution: %{_dist} %define mysql5 0 %define postgresql 0 %define sqlite 0 -%define bgconsole 0 -%define bwxconsole 0 +%define gconsole 0 +%define wxconsole 0 %endif %{expand: %%define gccver %(rpm -q --queryformat %%{version} gcc)} @@ -263,7 +268,7 @@ BuildRequires: openssl-devel BuildRequires: python, python-devel %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} %endif -%if %{bgconsole} +%if %{gconsole} BuildRequires: pkgconfig, pango-devel, atk-devel %endif %if %{rh7} @@ -274,7 +279,7 @@ BuildRequires: glibc-devel >= 2.2 BuildRequires: termcap BuildRequires: glibc-devel >= 2.3 %endif -%if %{su9} && %{bgconsole} +%if %{su9} && %{gconsole} BuildRequires: libgnome >= 2.0 BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 @@ -291,7 +296,7 @@ BuildRequires: freetype2-devel BuildRequires: termcap BuildRequires: glibc-devel >= 2.3 %endif -%if %{su10} && %{bgconsole} +%if %{su10} && %{gconsole} BuildRequires: libgnome >= 2.12 BuildRequires: gtk2-devel >= 2.8 BuildRequires: libgnomeui-devel >= 2.12 @@ -311,7 +316,7 @@ BuildRequires: libpng-devel BuildRequires: termcap BuildRequires: glibc-devel >= 2.5 %endif -%if %{su102} && %{bgconsole} +%if %{su102} && %{gconsole} BuildRequires: libgnome >= 2.16 BuildRequires: gtk2-devel >= 2.10 BuildRequires: libgnomeui-devel >= 2.16 @@ -333,7 +338,7 @@ BuildRequires: libstdc++-static-devel BuildRequires: glibc-static-devel BuildRequires: glibc-devel >= 2.3 %endif -%if %{mdk} && !%{mdv} && %{bgconsole} +%if %{mdk} && !%{mdv} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui2-devel >= 2.0 BuildRequires: libORBit2-devel @@ -344,7 +349,7 @@ BuildRequires: libbonobo-activation-devel BuildRequires: libGConf2-devel BuildRequires: freetype2-devel %endif -%if %{mdv} && %{bgconsole} +%if %{mdv} && %{gconsole} BuildRequires: gtk2-devel >= 2.8 BuildRequires: libgnomeui2-devel >= 2.10 BuildRequires: libORBit2-devel @@ -359,7 +364,7 @@ BuildRequires: freetype2-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if %{fc3} && %{bgconsole} +%if %{fc3} && %{gconsole} BuildRequires: gtk2-devel >= 2.4 BuildRequires: libgnomeui-devel >= 2.8 BuildRequires: ORBit2-devel @@ -374,7 +379,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if %{fc4} && %{bgconsole} +%if %{fc4} && %{gconsole} BuildRequires: gtk2-devel >= 2.6 BuildRequires: libgnomeui-devel >= 2.10 BuildRequires: ORBit2-devel @@ -389,7 +394,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.4 %endif -%if %{fc5} && %{bgconsole} +%if %{fc5} && %{gconsole} BuildRequires: gtk2-devel >= 2.8 BuildRequires: libgnomeui-devel >= 2.14 BuildRequires: ORBit2-devel @@ -403,7 +408,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.5 %endif -%if %{fc6} && %{bgconsole} +%if %{fc6} && %{gconsole} BuildRequires: gtk2-devel >= 2.10 BuildRequires: libgnomeui-devel >= 2.16 BuildRequires: ORBit2-devel @@ -417,7 +422,7 @@ BuildRequires: freetype-devel BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && %{bgconsole} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: ORBit2-devel @@ -450,7 +455,7 @@ BuildRequires: rh-postgresql-devel >= 7 BuildRequires: postgresql-devel >= 7 %endif -%if %{bwxconsole} +%if %{wxconsole} BuildRequires: wxGTK-devel >= 2.6 %endif @@ -694,14 +699,14 @@ This package installs scripts for updating older versions of the bacula database. %endif -%if %{bgconsole} -%package bgconsole +%if %{gconsole} +%package gconsole Summary: Bacula - The Network Backup Solution Group: System Environment/Daemons Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd, openssl %endif -%if %{bgconsole} && %{su9} +%if %{gconsole} && %{su9} Requires: gtk2 >= 2.0 Requires: libgnome >= 2.0 Requires: libgnomeui >= 2.0 @@ -715,7 +720,7 @@ Requires: gconf2 Requires: linc Requires: freetype2 %endif -%if %{bgconsole} && %{su10} +%if %{gconsole} && %{su10} Requires: gtk2 >= 2.8 Requires: libgnome >= 2.12 Requires: libgnomeui >= 2.12 @@ -732,7 +737,7 @@ Requires: fontconfig >= 2.3 Requires: gnome-vfs2 >= 2.12 Requires: libpng %endif -%if %{bgconsole} && %{su102} +%if %{gconsole} && %{su102} Requires: gtk2 >= 2.10 Requires: libgnome >= 2.16 Requires: libgnomeui >= 2.16 @@ -749,7 +754,7 @@ Requires: fontconfig >= 2.4 Requires: gnome-vfs2 >= 2.16 Requires: libpng %endif -%if %{bgconsole} && %{mdk} && !%{mdv} +%if %{gconsole} && %{mdk} && !%{mdv} Requires: gtk2 >= 2.0 Requires: libgnomeui2 Requires: glibc >= 2.3 @@ -760,7 +765,7 @@ Requires: libbonoboui >= 2.0 Requires: GConf2 Requires: freetype2 %endif -%if %{bgconsole} && %{mdv} +%if %{gconsole} && %{mdv} Requires: gtk2 >= 2.8 Requires: libgnomeui2 Requires: glibc >= 2.3 @@ -771,7 +776,7 @@ Requires: libbonoboui >= 2.10 Requires: GConf2 Requires: freetype2 %endif -%if %{bgconsole} && %{fc3} +%if %{gconsole} && %{fc3} Requires: gtk2 >= 2.4 Requires: libgnomeui >= 2.8 Requires: glibc >= 2.3 @@ -783,7 +788,7 @@ Requires: bonobo-activation Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && %{fc4} +%if %{gconsole} && %{fc4} Requires: gtk2 >= 2.6 Requires: libgnomeui >= 2.10 Requires: glibc >= 2.3 @@ -795,7 +800,7 @@ Requires: bonobo-activation Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && %{fc5} +%if %{gconsole} && %{fc5} Requires: gtk2 >= 2.8 Requires: libgnomeui >= 2.14 Requires: glibc >= 2.4 @@ -806,7 +811,7 @@ Requires: libbonoboui >= 2.14 Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && %{fc6} +%if %{gconsole} && %{fc6} Requires: gtk2 >= 2.10 Requires: libgnomeui >= 2.16 Requires: glibc >= 2.5 @@ -817,7 +822,7 @@ Requires: libbonoboui >= 2.16 Requires: GConf2 Requires: freetype %endif -%if %{bgconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -830,21 +835,21 @@ Requires: GConf2 Requires: linc Requires: freetype %endif -%if %{bgconsole} && %{su9} +%if %{gconsole} && %{su9} Requires: xsu %endif -%if %{bgconsole} && %{su10} +%if %{gconsole} && %{su10} Requires: xsu %endif -%if %{bgconsole} && %{su102} +%if %{gconsole} && %{su102} Requires: xsu %endif -%if %{bgconsole} && ! %{su9} && ! %{su10} && ! %{su102} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} Requires: usermode %endif -%if %{bgconsole} -%description bgconsole +%if %{gconsole} +%description gconsole %{blurb} %{blurb2} @@ -859,39 +864,39 @@ This is the Gnome Console package. It is an add-on to the client or server packages. %endif -%if %{bwxconsole} -%package bwxconsole +%if %{wxconsole} +%package wxconsole Summary: Bacula - The Network Backup Solution Group: System Environment/Daemons Requires: wxGTK >= 2.6, libstdc++, openssl %endif -%if %{bwxconsole} && %{su10} +%if %{wxconsole} && %{su10} Requires: gtk2 >= 2.8 %endif -%if %{bwxconsole} && %{su102} +%if %{wxconsole} && %{su102} Requires: gtk2 >= 2.10 %endif -%if %{bwxconsole} && %{fc3} +%if %{wxconsole} && %{fc3} Requires: gtk2 >= 2.4 %endif -%if %{bwxconsole} && %{fc4} +%if %{wxconsole} && %{fc4} Requires: gtk2 >= 2.6 %endif -%if %{bwxconsole} && %{fc5} +%if %{wxconsole} && %{fc5} Requires: gtk2 >= 2.8 %endif -%if %{bwxconsole} && %{fc6} +%if %{wxconsole} && %{fc6} Requires: gtk2 >= 2.10 %endif -%if %{bwxconsole} -%description bwxconsole +%if %{wxconsole} +%description wxconsole %{blurb} %{blurb2} @@ -972,15 +977,15 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}" %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ --enable-client-only \ - %if %{mdk} - --disable-nls \ - %endif + %if %{mdk} + --disable-nls \ + %endif --enable-static-fd make @@ -988,15 +993,15 @@ make %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ - --sysconfdir=%{sysconf_dir} \ - --with-scriptdir=%{script_dir} \ - --with-working-dir=%{working_dir} \ - --with-pid-dir=%{pid_dir} \ + --sysconfdir=%{sysconf_dir} \ + --with-scriptdir=%{script_dir} \ + --with-working-dir=%{working_dir} \ + --with-pid-dir=%{pid_dir} \ --enable-smartalloc \ -%if %{bgconsole} +%if %{gconsole} --enable-gnome \ %endif -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} --enable-tray-monitor \ %endif %if %{mysql} @@ -1008,16 +1013,16 @@ make %if %{postgresql} --with-postgresql \ %endif -%if %{bwxconsole} - --enable-bwx-console \ +%if %{wxconsole} + --enable-bwx-console \ %endif %if %{python} - --with-python \ + --with-python \ %endif %if %{client_only} - --enable-client-only \ + --enable-client-only \ %endif - --mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-subsys-dir=/var/lock/subsys \ --with-dir-user=%{director_daemon_user} \ --with-dir-group=%{daemon_group} \ @@ -1046,12 +1051,12 @@ mkdir -p $RPM_BUILD_ROOT/etc/log.d/conf/services mkdir -p $RPM_BUILD_ROOT/etc/log.d/scripts/services mkdir -p $RPM_BUILD_ROOT%{script_dir}/updatedb -%if %{bgconsole} || %{bwxconsole} +%if %{gconsole} || %{wxconsole} mkdir -p $RPM_BUILD_ROOT/usr/share/applications mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps %endif -%if %{bgconsole} || %{bwxconsole} +%if %{gconsole} || %{wxconsole} %define usermode_iftrick 1 %else %define usermode_iftrick 0 @@ -1070,11 +1075,11 @@ mkdir -p $RPM_BUILD_ROOT%{sqlite_bindir} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ install %if ! %{client_only} @@ -1082,10 +1087,10 @@ cd %{depkgs} make \ prefix=$RPM_BUILD_ROOT/usr \ sbindir=$RPM_BUILD_ROOT/usr/sbin \ - sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ - scriptdir=$RPM_BUILD_ROOT%{script_dir} \ + sysconfdir=$RPM_BUILD_ROOT%{sysconf_dir} \ + scriptdir=$RPM_BUILD_ROOT%{script_dir} \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - piddir=$RPM_BUILD_ROOT%{pid_dir} \ + piddir=$RPM_BUILD_ROOT%{pid_dir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ mtx-install cd ${cwd} @@ -1093,23 +1098,26 @@ cd ${cwd} # make install in manpages installs _everything_ shotgun style # so now delete what we will not be packaging -%if ! %{bwxconsole} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-bwxconsole.1.gz +%if ! %{wxconsole} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext} %endif -%if ! %{bgconsole} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-console-gnome.1.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-tray-monitor.1.gz +%if ! %{bat} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bat.1.%{manpage_ext} +%endif +%if ! %{gconsole} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-bgnome-console.1.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif %if %{client_only} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bsmtp.1.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-dir.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-sd.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bcopy.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bextract.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bls.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bscan.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/btape.8.gz -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/dbcheck.8.gz +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/bsmtp.1.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-dir.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bacula-sd.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bcopy.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bextract.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bls.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/bscan.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/btape.8.%{manpage_ext} +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/dbcheck.8.%{manpage_ext} %endif # fixme - make installs the mysql scripts for sqlite build @@ -1125,9 +1133,9 @@ rm -f $RPM_BUILD_ROOT%{script_dir}/startmysql rm -f $RPM_BUILD_ROOT%{script_dir}/stopmysql %endif -# fixme - make installs bgconsole script for build without bgconsole -%if ! %{bgconsole} -rm -f $RPM_BUILD_ROOT%{script_dir}/bgconsole +# fixme - make installs gconsole script for build without gconsole +%if ! %{gconsole} +rm -f $RPM_BUILD_ROOT%{script_dir}/gconsole %endif rm -f $RPM_BUILD_ROOT/usr/sbin/static-bacula-fd @@ -1155,54 +1163,54 @@ rm -f $RPM_BUILD_ROOT/etc/init.d/bacula-sd %endif # install the menu stuff -%if %{bgconsole} && %{su9} +%if %{gconsole} && %{su9} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bgconsole} && %{su10} +%if %{gconsole} && %{su10} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bgconsole} && %{su102} +%if %{gconsole} && %{su102} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bwxconsole} && %{su10} +%if %{wxconsole} && %{su10} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm -cp -p scripts/bwxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bwxconsole.desktop +cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop %endif -%if %{bwxconsole} && %{su102} +%if %{wxconsole} && %{su102} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm -cp -p scripts/bwxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bwxconsole.desktop +cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop %endif %if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{fc5} || %{mdk} %define iftrick 1 %else %define iftrick 0 %endif -%if %{bgconsole} && %{iftrick} +%if %{gconsole} && %{iftrick} cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png cp -p scripts/bacula.desktop.gnome2.consolehelper $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop -cp -p scripts/gnome-console.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/gnome-console -cp -p scripts/gnome-console.pamd $RPM_BUILD_ROOT/etc/pam.d/gnome-console -ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/gnome-console +cp -p scripts/bgnome-console.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bgnome-console +cp -p scripts/bgnome-console.pamd $RPM_BUILD_ROOT/etc/pam.d/bgnome-console +ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bgnome-console %endif -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{bwxconsole} && %{iftrick} +%if %{wxconsole} && %{iftrick} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm -cp -p scripts/bwxconsole.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/bwxconsole.desktop -cp -p scripts/bwxconsole.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bwxconsole -cp -p scripts/bwxconsole.pamd $RPM_BUILD_ROOT/etc/pam.d/bwxconsole -ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bwxconsole +cp -p scripts/wxconsole.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop +cp -p scripts/wxconsole.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/bwx-console +cp -p scripts/wxconsole.pamd $RPM_BUILD_ROOT/etc/pam.d/bwx-console +ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/bwx-console %endif # install sqlite @@ -1240,17 +1248,12 @@ 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 rm -f src/filed/static-bacula-fd -%if %{bwxconsole} -mv $RPM_BUILD_ROOT/usr/sbin/bwx-console $RPM_BUILD_ROOT/usr/sbin/bwxconsole -mv $RPM_BUILD_ROOT%{sysconf_dir}/bwx-console.conf $RPM_BUILD_ROOT%{sysconf_dir}/bwxconsole.conf -%endif - # now clean up permissions that are left broken by the install %if ! %{client_only} chmod o-r $RPM_BUILD_ROOT%{script_dir}/query.sql %endif chmod o-rwx $RPM_BUILD_ROOT%{working_dir} -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} chmod 755 $RPM_BUILD_ROOT/usr/sbin/bacula-tray-monitor chmod 644 $RPM_BUILD_ROOT%{sysconf_dir}/tray-monitor.conf %endif @@ -1408,7 +1411,7 @@ if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then echo "This bacula upgrade will update a bacula database from version 9 to 10." echo "You appear to be running database version $DB_VER. You must first update" echo "your database to version 9 and then install this upgrade. The alternative" - echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" + echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" echo "catalog information, then do the upgrade. Information on updating a" echo "database older than version 9 can be found in the release notes." exit 1 @@ -1422,7 +1425,7 @@ fi %if ! %{client_only} # check for and copy %{sysconf_dir}/console.conf to bconsole.conf if [ -s %{sysconf_dir}/console.conf ];then - cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf + cp -p %{sysconf_dir}/console.conf %{sysconf_dir}/bconsole.conf fi # create the daemon users and groups @@ -1504,11 +1507,11 @@ DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Granting privileges for MySQL user bacula..." - %{script_dir}/grant_mysql_privileges + %{script_dir}/grant_mysql_privileges echo "Creating MySQL bacula database..." - %{script_dir}/create_mysql_database + %{script_dir}/create_mysql_database echo "Creating bacula tables..." - %{script_dir}/make_mysql_tables + %{script_dir}/make_mysql_tables # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1516,7 +1519,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." mysqldump -f --opt bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_mysql_tables + %{script_dir}/update_mysql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1532,16 +1535,16 @@ if [ -s %{working_dir}/bacula.db ]; then echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite %{working_dir}/bacula.db | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_sqlite_tables + %{script_dir}/update_sqlite_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi else # create the database and tables echo "Hmm, doesn't look like you have an existing database." echo "Creating SQLite database..." - %{script_dir}/create_sqlite_database + %{script_dir}/create_sqlite_database echo "Creating the SQLite tables..." - %{script_dir}/make_sqlite_tables + %{script_dir}/make_sqlite_tables fi %endif @@ -1554,11 +1557,11 @@ DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head if [ -z "$DB_VER" ]; then echo "Hmm, doesn't look like you have an existing database." echo "Creating PostgreSQL bacula database..." - %{script_dir}/create_postgresql_database + %{script_dir}/create_postgresql_database echo "Creating bacula tables..." - %{script_dir}/make_postgresql_tables + %{script_dir}/make_postgresql_tables echo "Granting privileges for PostgreSQL user bacula..." - %{script_dir}/grant_postgresql_privileges + %{script_dir}/grant_postgresql_privileges # check to see if we need to upgrade a 1.38 or lower database elif [ "$DB_VER" -lt "10" ]; then @@ -1566,7 +1569,7 @@ elif [ "$DB_VER" -lt "10" ]; then echo "Backing up your current database..." pg_dump bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 echo "Upgrading bacula database ..." - %{script_dir}/update_postgresql_tables + %{script_dir}/update_postgresql_tables echo "If bacula works correctly you can remove the backup file %{working_dir}/bacula_backup.sql.bz2" fi @@ -1575,7 +1578,7 @@ fi %if ! %{client_only} # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1682,7 +1685,7 @@ fi # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1719,19 +1722,19 @@ fi echo "The database update scripts were installed to %{script_dir}/updatedb" %endif -%if %{bgconsole} -%files bgconsole +%if %{gconsole} +%files gconsole %defattr(-,root,root) /usr/sbin/bgnome-console %attr(-, root, %{daemon_group}) %dir %{script_dir} -%attr(-, root, %{daemon_group}) %{script_dir}/bgconsole -%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/gnome-console.conf +%attr(-, root, %{daemon_group}) %{script_dir}/gconsole +%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bgnome-console.conf /usr/share/pixmaps/bacula.png /usr/share/applications/bacula.desktop -%{_mandir}/man1/bacula-console-gnome.1.%{manpage_ext} +%{_mandir}/man1/bacula-bgnome-console.1.%{manpage_ext} %endif -%if %{bgconsole} && ! %{rh8} +%if %{gconsole} && ! %{rh8} /usr/sbin/bacula-tray-monitor %config(noreplace) %{sysconf_dir}/tray-monitor.conf /usr/share/pixmaps/bacula-tray-monitor.xpm @@ -1739,15 +1742,15 @@ echo "The database update scripts were installed to %{script_dir}/updatedb" %{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif -%if %{bgconsole} && ! %{su9} && ! %{su10} && ! %{su102} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} # add the console helper files -%config(noreplace,missingok) /etc/pam.d/gnome-console -%config(noreplace,missingok) /etc/security/console.apps/gnome-console -/usr/bin/gnome-console +%config(noreplace,missingok) /etc/pam.d/bgnome-console +%config(noreplace,missingok) /etc/security/console.apps/bgnome-console +/usr/bin/bgnome-console %endif -%if %{bgconsole} -%pre bgconsole +%if %{gconsole} +%pre gconsole # create the daemon group HAVE_BACULA=`grep %{daemon_group} %{group_file} 2>/dev/null` if [ -z "$HAVE_BACULA" ]; then @@ -1756,10 +1759,10 @@ if [ -z "$HAVE_BACULA" ]; then echo "See the manual chapter \"Running Bacula\" for details." fi -%post bgconsole +%post gconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1773,26 +1776,26 @@ if [ -d %{sysconf_dir} ]; then fi %endif -%if %{bwxconsole} -%files bwxconsole +%if %{wxconsole} +%files wxconsole %defattr(-,root,root) -/usr/sbin/bwxconsole +/usr/sbin/bwx-console %attr(-, root, %{daemon_group}) %dir %{sysconf_dir} -%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bwxconsole.conf +%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bwx-console.conf /usr/share/pixmaps/wxwin16x16.xpm -/usr/share/applications/bwxconsole.desktop +/usr/share/applications/wxconsole.desktop %{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext} %endif -%if %{bwxconsole} && ! %{su9} && ! %{su10} && ! %{su102} +%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} # add the console helper files -%config(noreplace,missingok) /etc/pam.d/bwxconsole -%config(noreplace,missingok) /etc/security/console.apps/bwxconsole -/usr/bin/bwxconsole +%config(noreplace,missingok) /etc/pam.d/bwx-console +%config(noreplace,missingok) /etc/security/console.apps/bwx-console +/usr/bin/bwx-console %endif -%if %{bwxconsole} -%pre bwxconsole +%if %{wxconsole} +%pre wxconsole # create the daemon group HAVE_BACULA=`grep %{daemon_group} %{group_file} 2>/dev/null` if [ -z "$HAVE_BACULA" ]; then @@ -1801,10 +1804,10 @@ if [ -z "$HAVE_BACULA" ]; then echo "See the manual chapter \"Running Bacula\" for details." fi -%post bwxconsole +%post wxconsole # generate passwords if needed if [ -d %{sysconf_dir} ]; then - cd %{sysconf_dir} + cd %{sysconf_dir} for file in *.conf; do for string in XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX; do need_password=`grep $string $file 2>/dev/null` @@ -1819,6 +1822,11 @@ fi %endif %changelog +* Sun Apr 29 2007 D. Scott Barninger +- 2.1.8 +- gnome-console now bgnome-console +- wxconsole now bwx-console +- add build option for bat * Sat Apr 08 2007 D. Scott Barninger - merge Otto Mueller's patch but keep script dir set to /etc/bacula - add build tag for Scientific Linux per Jon Peatfield diff --git a/bacula/scripts/gnome-console.pamd b/bacula/scripts/bgnome-console.pamd similarity index 100% rename from bacula/scripts/gnome-console.pamd rename to bacula/scripts/bgnome-console.pamd diff --git a/bacula/scripts/wxconsole.console_apps.in b/bacula/scripts/wxconsole.console_apps.in index c0670cac5c..04a9d7e59c 100644 --- a/bacula/scripts/wxconsole.console_apps.in +++ b/bacula/scripts/wxconsole.console_apps.in @@ -1,3 +1,3 @@ USER=root -PROGRAM=@sbindir@/wxconsole +PROGRAM=@sbindir@/bwx-console SESSION=true diff --git a/bacula/scripts/wxconsole.desktop.consolehelper.in b/bacula/scripts/wxconsole.desktop.consolehelper.in index 90004644fa..0bc16a12f0 100644 --- a/bacula/scripts/wxconsole.desktop.consolehelper.in +++ b/bacula/scripts/wxconsole.desktop.consolehelper.in @@ -2,7 +2,7 @@ Name=Bacula WX Console Comment=Bacula Director Console Icon=/usr/share/pixmaps/wxwin16x16.xpm -Exec=/usr/bin/wxconsole -c @sysconfdir@/wxconsole.conf +Exec=/usr/bin/bwx-console -c @sysconfdir@/bwx-console.conf Terminal=false Type=Application Encoding=UTF-8 diff --git a/bacula/scripts/wxconsole.desktop.xsu.in b/bacula/scripts/wxconsole.desktop.xsu.in index a273b2da00..a9a6c18724 100644 --- a/bacula/scripts/wxconsole.desktop.xsu.in +++ b/bacula/scripts/wxconsole.desktop.xsu.in @@ -2,7 +2,7 @@ Name=Bacula WX Console Comment=Bacula Director Console Icon=/usr/share/pixmaps/wxwin16x16.xpm -Exec=gnomesu -t "Query" -c "@sbindir@/wxconsole -c @sysconfdir@/wxconsole.conf" -d -e -m "In order to run the bacula wx console as root, ^additional information is required." +Exec=gnomesu -t "Query" -c "@sbindir@/bwx-console -c @sysconfdir@/bwx-console.conf" -d -e -m "In order to run the bacula wx console as root, ^additional information is required." Terminal=false Type=Application Encoding=UTF-8 -- 2.39.5