# Bacula RPM spec file
-# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V.
+# Copyright (C) 2000-2006 Kern Sibbald
# Platform Build Configuration
%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
%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)}
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}
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
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
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
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
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
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
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
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
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
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
BuildRequires: postgresql-devel >= 7
%endif
-%if %{bwxconsole}
+%if %{wxconsole}
BuildRequires: wxGTK-devel >= 2.6
%endif
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
Requires: linc
Requires: freetype2
%endif
-%if %{bgconsole} && %{su10}
+%if %{gconsole} && %{su10}
Requires: gtk2 >= 2.8
Requires: libgnome >= 2.12
Requires: libgnomeui >= 2.12
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
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
Requires: GConf2
Requires: freetype2
%endif
-%if %{bgconsole} && %{mdv}
+%if %{gconsole} && %{mdv}
Requires: gtk2 >= 2.8
Requires: libgnomeui2
Requires: glibc >= 2.3
Requires: GConf2
Requires: freetype2
%endif
-%if %{bgconsole} && %{fc3}
+%if %{gconsole} && %{fc3}
Requires: gtk2 >= 2.4
Requires: libgnomeui >= 2.8
Requires: glibc >= 2.3
Requires: GConf2
Requires: freetype
%endif
-%if %{bgconsole} && %{fc4}
+%if %{gconsole} && %{fc4}
Requires: gtk2 >= 2.6
Requires: libgnomeui >= 2.10
Requires: glibc >= 2.3
Requires: GConf2
Requires: freetype
%endif
-%if %{bgconsole} && %{fc5}
+%if %{gconsole} && %{fc5}
Requires: gtk2 >= 2.8
Requires: libgnomeui >= 2.14
Requires: glibc >= 2.4
Requires: GConf2
Requires: freetype
%endif
-%if %{bgconsole} && %{fc6}
+%if %{gconsole} && %{fc6}
Requires: gtk2 >= 2.10
Requires: libgnomeui >= 2.16
Requires: glibc >= 2.5
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
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}
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}
%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
%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}
%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} \
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
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}
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}
# 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
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
%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
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
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
%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
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
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
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
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
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
%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`
# 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`
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
%{_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
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`
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
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`
%endif
%changelog
+* Sun Apr 29 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 2.1.8
+- gnome-console now bgnome-console
+- wxconsole now bwx-console
+- add build option for bat
* Sat Apr 08 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
- merge Otto Mueller's patch but keep script dir set to /etc/bacula
- add build tag for Scientific Linux per Jon Peatfield <J.S.Peatfield@damtp.cam.ac.uk>
# Bacula RPM spec file
-# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V.
+# Copyright (C) 2000-2006 Kern Sibbald
# Platform Build Configuration
%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
%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)}
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}
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
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
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
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
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
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
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
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
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
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
BuildRequires: postgresql-devel >= 7
%endif
-%if %{bwxconsole}
+%if %{wxconsole}
BuildRequires: wxGTK-devel >= 2.6
%endif
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
Requires: linc
Requires: freetype2
%endif
-%if %{bgconsole} && %{su10}
+%if %{gconsole} && %{su10}
Requires: gtk2 >= 2.8
Requires: libgnome >= 2.12
Requires: libgnomeui >= 2.12
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
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
Requires: GConf2
Requires: freetype2
%endif
-%if %{bgconsole} && %{mdv}
+%if %{gconsole} && %{mdv}
Requires: gtk2 >= 2.8
Requires: libgnomeui2
Requires: glibc >= 2.3
Requires: GConf2
Requires: freetype2
%endif
-%if %{bgconsole} && %{fc3}
+%if %{gconsole} && %{fc3}
Requires: gtk2 >= 2.4
Requires: libgnomeui >= 2.8
Requires: glibc >= 2.3
Requires: GConf2
Requires: freetype
%endif
-%if %{bgconsole} && %{fc4}
+%if %{gconsole} && %{fc4}
Requires: gtk2 >= 2.6
Requires: libgnomeui >= 2.10
Requires: glibc >= 2.3
Requires: GConf2
Requires: freetype
%endif
-%if %{bgconsole} && %{fc5}
+%if %{gconsole} && %{fc5}
Requires: gtk2 >= 2.8
Requires: libgnomeui >= 2.14
Requires: glibc >= 2.4
Requires: GConf2
Requires: freetype
%endif
-%if %{bgconsole} && %{fc6}
+%if %{gconsole} && %{fc6}
Requires: gtk2 >= 2.10
Requires: libgnomeui >= 2.16
Requires: glibc >= 2.5
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
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}
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}
%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
%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}
%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} \
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
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}
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}
# 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
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
%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
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
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
%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
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
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
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
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
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
%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`
# 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`
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
%{_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
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`
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
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`
%endif
%changelog
+* Sun Apr 29 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 2.1.8
+- gnome-console now bgnome-console
+- wxconsole now bwx-console
+- add build option for bat
* Sat Apr 08 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
- merge Otto Mueller's patch but keep script dir set to /etc/bacula
- add build tag for Scientific Linux per Jon Peatfield <J.S.Peatfield@damtp.cam.ac.uk>
# Bacula RPM spec file
-# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V.
+# Copyright (C) 2000-2006 Kern Sibbald
# Platform Build Configuration
%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
%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)}
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}
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
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
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
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
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
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
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
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
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
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
BuildRequires: postgresql-devel >= 7
%endif
-%if %{bwxconsole}
+%if %{wxconsole}
BuildRequires: wxGTK-devel >= 2.6
%endif
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
Requires: linc
Requires: freetype2
%endif
-%if %{bgconsole} && %{su10}
+%if %{gconsole} && %{su10}
Requires: gtk2 >= 2.8
Requires: libgnome >= 2.12
Requires: libgnomeui >= 2.12
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
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
Requires: GConf2
Requires: freetype2
%endif
-%if %{bgconsole} && %{mdv}
+%if %{gconsole} && %{mdv}
Requires: gtk2 >= 2.8
Requires: libgnomeui2
Requires: glibc >= 2.3
Requires: GConf2
Requires: freetype2
%endif
-%if %{bgconsole} && %{fc3}
+%if %{gconsole} && %{fc3}
Requires: gtk2 >= 2.4
Requires: libgnomeui >= 2.8
Requires: glibc >= 2.3
Requires: GConf2
Requires: freetype
%endif
-%if %{bgconsole} && %{fc4}
+%if %{gconsole} && %{fc4}
Requires: gtk2 >= 2.6
Requires: libgnomeui >= 2.10
Requires: glibc >= 2.3
Requires: GConf2
Requires: freetype
%endif
-%if %{bgconsole} && %{fc5}
+%if %{gconsole} && %{fc5}
Requires: gtk2 >= 2.8
Requires: libgnomeui >= 2.14
Requires: glibc >= 2.4
Requires: GConf2
Requires: freetype
%endif
-%if %{bgconsole} && %{fc6}
+%if %{gconsole} && %{fc6}
Requires: gtk2 >= 2.10
Requires: libgnomeui >= 2.16
Requires: glibc >= 2.5
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
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}
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}
%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
%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}
%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} \
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
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}
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}
# 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
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
%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
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
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
%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
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
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
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
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
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
%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`
# 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`
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
%{_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
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`
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
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`
%endif
%changelog
+* Sun Apr 29 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 2.1.8
+- gnome-console now bgnome-console
+- wxconsole now bwx-console
+- add build option for bat
* Sat Apr 08 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
- merge Otto Mueller's patch but keep script dir set to /etc/bacula
- add build tag for Scientific Linux per Jon Peatfield <J.S.Peatfield@damtp.cam.ac.uk>
--- /dev/null
+#%PAM-1.0
+auth sufficient pam_rootok.so
+auth sufficient pam_timestamp.so
+auth required pam_stack.so service=system-auth
+session optional pam_xauth.so
+session optional pam_timestamp.so
+account required pam_permit.so
+++ /dev/null
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth sufficient pam_timestamp.so
-auth required pam_stack.so service=system-auth
-session optional pam_xauth.so
-session optional pam_timestamp.so
-account required pam_permit.so
USER=root
-PROGRAM=@sbindir@/wxconsole
+PROGRAM=@sbindir@/bwx-console
SESSION=true
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
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
projects / bacula / bacula / commitdiff