X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fplatforms%2Fredhat%2Fbacula.spec.in;h=723bf9ab147591429870dbef989ca7dc7c959682;hb=f37e0f4eb88e304f5e785cd83ad897c2f47cbf4c;hp=0a019e29255c614b8b397beb45a22687b35dd260;hpb=a2568d08c38401784cee81e5d1d37c313b470193;p=bacula%2Fbacula

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 0a019e2925..723bf9ab14 100644
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -6,7 +6,7 @@
 # basic defines for every build
 %define _version @VERSION@
 %define _release 1
-%define depkgs_version 22Feb08
+%define depkgs_version 11Sep08
 %define _rescuever @VERSION@
 %define docs_version @VERSION@
 
@@ -68,9 +68,9 @@ Prefix: %{_prefix}
 %define _sbindir /opt/bacula
 %define _subsysdir /opt/bacula/working
 %define sqlite_bindir /opt/bacula/sqlite
-%define _mandir /opt/bacula
+%define _mandir /usr/share/man
 %define sysconf_dir /opt/bacula
-%define script_dir /opt/bacula
+%define script_dir /opt/bacula/scripts
 %define working_dir /opt/bacula/working
 %define pid_dir /opt/bacula/working
 %else
@@ -169,6 +169,8 @@ Prefix: %{_prefix}
 %{?build_su103:%define su103 1}
 %define su110 0
 %{?build_su110:%define su110 1}
+%define su111 0
+%{?build_su111:%define su111 1}
 # Mandrake builds
 %define mdk 0
 %{?build_mdk:%define mdk 1}
@@ -181,7 +183,7 @@ Prefix: %{_prefix}
 %{?build_client_only:%define client_only 1}
 
 # test for a platform definition
-%if !%{rh7} && !%{rh8} && !%{rh9} && !%{fc1} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk}
+%if !%{rh7} && !%{rh8} && !%{rh9} && !%{fc1} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{su111} && !%{mdk}
 %{error: You must specify a platform. Please examine the spec file.}
 exit 1
 %endif
@@ -247,7 +249,7 @@ exit 1
 %if %{wb3} && ! %{rhel3} && ! %{centos3} && ! %{sl3}
 %define _dist %(grep White /etc/whitebox-release)
 %endif
-%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110}
+%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} || %{su111}
 %define _dist %(grep -i SuSE /etc/SuSE-release)
 %endif
 %if %{mdk}
@@ -271,6 +273,10 @@ Distribution: %{_dist}
 # specifically disallow gconsole if desired
 %{?nobuild_gconsole:%define gconsole 0}
 
+# specifically disallow rescue files
+%define rescue 0
+%{?build_rescue:%define rescue 1}
+
 # Should we build wxconsole, only wxWidgets >=2.6 is supported
 # SuSE 10 and FC4 and newer
 %define wxconsole 0
@@ -325,6 +331,9 @@ BuildRequires: python, python-devel
 %if %{gconsole}
 BuildRequires: pkgconfig, pango-devel, atk-devel
 %endif
+%if %{bat}
+BuildRequires: pkgconfig
+%endif
 
 # Rh qt4 packages don't have a provide for, guess what, qt!
 # still broken in fc8, ok in fc9
@@ -441,6 +450,26 @@ BuildRequires: fontconfig-devel >= 2.4
 BuildRequires: gnome-vfs2-devel >= 2.22
 BuildRequires: libpng-devel
 %endif
+%if %{su111}
+BuildRequires: termcap
+BuildRequires: glibc-devel >= 2.9
+%endif
+%if %{su111} && %{gconsole}
+BuildRequires: libgnome >= 2.24
+BuildRequires: gtk2-devel >= 2.14
+BuildRequires: libgnomeui-devel >= 2.24
+BuildRequires: ORBit2-devel
+BuildRequires: libart_lgpl-devel >= 2.3
+BuildRequires: libbonobo-devel >= 2.24
+BuildRequires: libbonoboui-devel >= 2.24
+BuildRequires: bonobo-activation-devel
+BuildRequires: gconf2-devel
+BuildRequires: freetype2-devel
+BuildRequires: cairo-devel
+BuildRequires: fontconfig-devel >= 2.6
+BuildRequires: gnome-vfs2-devel >= 2.24
+BuildRequires: libpng-devel
+%endif
 %if %{mdk}
 BuildRequires: libtermcap-devel
 BuildRequires: libstdc++-static-devel
@@ -569,11 +598,11 @@ BuildRequires: libbonoboui-devel >= 2.22
 BuildRequires: GConf2-devel
 BuildRequires: freetype-devel
 %endif
-%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9}
+%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{su111} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9}
 BuildRequires: libtermcap-devel
 BuildRequires: glibc-devel >= 2.3
 %endif
-%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && %{gconsole}
+%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{su111} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && %{gconsole}
 BuildRequires: gtk2-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: ORBit2-devel
@@ -637,7 +666,7 @@ Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server
 Conflicts: bacula-client
 Obsoletes: bacula-rescue
 
-%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110}
+%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} || %{su111}
 Conflicts: bacula
 %endif
 
@@ -663,7 +692,11 @@ Requires: termcap
 Requires: glibc >= 2.8
 Requires: termcap
 %endif
-%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9}
+%if %{su111}
+Requires: glibc >= 2.9
+Requires: termcap
+%endif
+%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{su111} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9}
 Requires: glibc >= 2.3
 Requires: libtermcap
 %endif
@@ -691,7 +724,7 @@ Requires: mysql-server >= 3.23
 Requires: mysql >= 4.0
 Requires: mysql-server >= 4.0
 %endif
-%if %{mysql} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{mdk} && %{mysql5}
+%if %{mysql} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{su111} && ! %{mdk} && %{mysql5}
 Requires: mysql >= 5.0
 Requires: mysql-server >= 5.0
 %endif
@@ -724,6 +757,10 @@ Requires: mysql-client >= 5.0
 Requires: mysql >= 5.0
 Requires: mysql-client >= 5.0
 %endif
+%if %{mysql} && %{su111} && %{mysql5}
+Requires: mysql >= 5.0
+Requires: mysql-client >= 5.0
+%endif
 
 %if %{mysql} && %{mdk} && ! %{mysql4}
 Requires: mysql >= 3.23
@@ -800,7 +837,7 @@ Conflicts: bacula-sqlite
 Conflicts: bacula-postgresql
 Obsoletes: bacula-rescue
 
-%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110}
+%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} || %{su111}
 Provides: bacula
 %endif
 
@@ -826,7 +863,11 @@ Requires: termcap
 Requires: glibc >= 2.8
 Requires: termcap
 %endif
-%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9}
+%if %{su111}
+Requires: glibc >= 2.9
+Requires: termcap
+%endif
+%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{su111} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9}
 Requires: glibc >= 2.3
 Requires: libtermcap
 %endif
@@ -977,6 +1018,23 @@ Requires: fontconfig >= 2.4
 Requires: gnome-vfs2 >= 2.22
 Requires: libpng
 %endif
+%if %{gconsole} && %{su111}
+Requires: gtk2 >= 2.14
+Requires: libgnome >= 2.24
+Requires: libgnomeui >= 2.24
+Requires: glibc >= 2.9
+Requires: ORBit2
+Requires: libart_lgpl >= 2.3
+Requires: libbonobo >= 2.24
+Requires: libbonoboui >= 2.24
+Requires: bonobo-activation
+Requires: gconf2
+Requires: freetype2
+Requires: cairo
+Requires: fontconfig >= 2.6
+Requires: gnome-vfs2 >= 2.24
+Requires: libpng
+%endif
 %if %{gconsole} && %{mdk} && !%{mdv}
 Requires: gtk2 >= 2.0
 Requires: libgnomeui2
@@ -1078,7 +1136,7 @@ Requires: libbonoboui >= 2.22
 Requires: GConf2
 Requires: freetype
 %endif
-%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9}
+%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{su111} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9}
 Requires: gtk2 >= 2.0
 Requires: libgnomeui >= 2.0
 Requires: glibc >= 2.3
@@ -1106,7 +1164,10 @@ Requires: xsu
 %if %{gconsole} && %{su110}
 Requires: xsu
 %endif
-%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110}
+%if %{gconsole} && %{su111}
+Requires: xsu
+%endif
+%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{su111}
 Requires: usermode
 %endif
 
@@ -1149,6 +1210,10 @@ Requires: gtk2 >= 2.12
 Requires: gtk2 >= 2.12
 %endif
 
+%if %{wxconsole} && %{su111}
+Requires: gtk2 >= 2.14
+%endif
+
 %if %{wxconsole} && %{fc3}  
 Requires: gtk2 >= 2.4
 %endif
@@ -1247,6 +1312,18 @@ Requires: libstdc++
 Requires: zlib
 %endif
 
+%if %{bat} && %{su111}
+Requires: openssl
+Requires: glibc >= 2.9
+Requires: fontconfig
+Requires: freetype2
+Requires: libgcc
+Requires: libpng
+Requires: qt >= 4.2
+Requires: libstdc++
+Requires: zlib
+%endif
+
 %if %{bat} && %{fc5}
 Requires: openssl
 Requires: glibc >= 2.4
@@ -1326,7 +1403,7 @@ the client or server packages.
 # SuSE turns off stripping of binaries by default. In order to get
 # stripped packages we must generate debug package. RedHat and Mandriva
 # turn debug packages on by default but strip binaries regardless.
-%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110}
+%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} || %{su111}
 %debug_package
 %endif
 
@@ -1340,10 +1417,17 @@ the client or server packages.
 
 %build
 
-%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110}
+%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} || %{su111}
 export LDFLAGS="${LDFLAGS} -L/usr/lib/termcap"
 %endif
 
+%if %{bat}
+export QTDIR=$(pkg-config --variable=prefix QtCore)
+export QTINC=$(pkg-config --variable=includedir QtCore)
+export QTLIB=$(pkg-config --variable=libdir QtCore)
+export PATH=${QTDIR}/bin/:${PATH}
+%endif
+
 cwd=${PWD}
 cd %{depkgs}
 %if %{sqlite}
@@ -1394,6 +1478,9 @@ patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch
 %if %{sqlite} && %{su110}
 patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch
 %endif
+%if %{sqlite} && %{su111}
+patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch
+%endif
 
 # 64 bit lib location hacks
 # as of 1.39.18 it should not be necessary to enable x86_64 as configure is
@@ -1420,6 +1507,7 @@ export QTINC=/usr/lib64/qt4/include/
 export QTLIB=/usr/lib64/qt4/
 %endif
 
+%if %{rescue}
 %configure \
         --prefix=%{_prefix} \
         --sbindir=%{_sbindir} \
@@ -1435,6 +1523,7 @@ export QTLIB=/usr/lib64/qt4/
         --enable-static-fd
 
 make
+%endif
 
 %configure \
         --prefix=%{_prefix} \
@@ -1476,6 +1565,7 @@ make
 	--disable-batch-insert \
 %endif
 	--mandir=%{_mandir} \
+	--with-plugindir=%{script_dir} \
         --with-subsys-dir=%{_subsysdir} \
         --with-dir-user=%{director_daemon_user} \
         --with-dir-group=%{daemon_group} \
@@ -1515,7 +1605,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
 %define usermode_iftrick 0
 %endif
 
-%if %{usermode_iftrick} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110}
+%if %{usermode_iftrick} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{su111}
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
 mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -1525,15 +1615,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT%{sqlite_bindir}
 %endif
 
-make \
-        prefix=$RPM_BUILD_ROOT%{_prefix} \
-        sbindir=$RPM_BUILD_ROOT%{_sbindir} \
-	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} \
-        install
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %if ! %{client_only} && %{mtx}
 cd %{depkgs}
@@ -1594,7 +1676,7 @@ rm -f $RPM_BUILD_ROOT%{script_dir}/gconsole
 rm -f $RPM_BUILD_ROOT%{_sbindir}/static-bacula-fd
 
 # install the init scripts
-%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110}
+%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} || %{su111}
 cp -p platforms/suse/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir
 cp -p platforms/suse/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd
 cp -p platforms/suse/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd
@@ -1604,7 +1686,7 @@ cp -p platforms/mandrake/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir
 cp -p platforms/mandrake/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd
 cp -p platforms/mandrake/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd
 %endif
-%if ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{mdk}
+%if ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{su111} && ! %{mdk}
 cp -p platforms/redhat/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir
 cp -p platforms/redhat/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd
 cp -p platforms/redhat/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd
@@ -1646,6 +1728,12 @@ cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/b
 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 %{gconsole} && %{su111}
+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 %{wxconsole} && %{su10}
 cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm
 cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop
@@ -1662,6 +1750,10 @@ cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxcon
 cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm
 cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop
 %endif
+%if %{wxconsole} && %{su111}
+cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm
+cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop
+%endif
 %if %{bat} && %{su102}
 cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_icon.png
 cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
@@ -1674,6 +1766,10 @@ cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
 cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_icon.png
 cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
 %endif
+%if %{bat} && %{su111}
+cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_icon.png
+cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
+%endif
 %if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{fc5} || %{fc6} || %{fc7} || %{fc8} || %{fc9} || %{mdk}
 %define iftrick 1
 %else
@@ -1729,6 +1825,7 @@ chmod 644 $RPM_BUILD_ROOT/etc/log.d/conf/services/bacula.conf
 %endif
 
 # install the rescue files
+%if %{rescue}
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/freebsd
 mkdir $RPM_BUILD_ROOT%{script_dir}/rescue/solaris
@@ -1744,6 +1841,7 @@ cp -pr %{_rescuesrc}/knoppix $RPM_BUILD_ROOT%{script_dir}/rescue/
 touch $RPM_BUILD_ROOT%{script_dir}/rescue/linux/cdrom/rpm_release
 cp -p src/filed/static-bacula-fd $RPM_BUILD_ROOT%{script_dir}/rescue/linux/cdrom/bacula/bin/bacula-fd
 rm -f src/filed/static-bacula-fd
+%endif
 
 # install bat since make doesn't at the moment
 %if %{bat}
@@ -1751,6 +1849,11 @@ cp -p src/qt-console/bat $RPM_BUILD_ROOT%{_sbindir}/bat
 cp -p src/qt-console/bat.conf $RPM_BUILD_ROOT%{sysconf_dir}/bat.conf
 %endif
 
+# remove the docs installed by make
+%if ! %{single_dir}
+rm -rf $RPM_BUILD_ROOT/usr/share/doc
+%endif
+
 # install docs for single dir installation
 %if %{single_dir}
 mkdir $RPM_BUILD_ROOT%{_prefix}/doc
@@ -1758,6 +1861,7 @@ cp COPYING $RPM_BUILD_ROOT%{_prefix}/doc/
 cp ChangeLog $RPM_BUILD_ROOT%{_prefix}/doc/
 cp ReleaseNotes $RPM_BUILD_ROOT%{_prefix}/doc/
 cp VERIFYING $RPM_BUILD_ROOT%{_prefix}/doc/
+cp LICENSE $RPM_BUILD_ROOT%{_prefix}/doc/
 cp kernstodo $RPM_BUILD_ROOT%{_prefix}/doc/
 cp %{_docsrc}/manual/bacula.pdf $RPM_BUILD_ROOT%{_prefix}/doc/
 cp %{_docsrc}/developers/developers.pdf $RPM_BUILD_ROOT%{_prefix}/doc/
@@ -1846,16 +1950,17 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %attr(-, root, %{daemon_group}) %{script_dir}/delete_catalog_backup
 %attr(-, root, %{daemon_group}) %{script_dir}/btraceback.dbx
 %attr(-, root, %{daemon_group}) %{script_dir}/btraceback.gdb
-%attr(-, root, %{daemon_group}) %{script_dir}/rescue
 %attr(-, root, %{daemon_group}) %{script_dir}/disk-changer
 %attr(-, root, %{daemon_group}) %{script_dir}/bacula-ctl-dir
 %attr(-, root, %{daemon_group}) %{script_dir}/bacula-ctl-fd
 %attr(-, root, %{daemon_group}) %{script_dir}/bacula-ctl-sd
+%attr(-, root, %{daemon_group}) %{script_dir}/bpipe-fd.so
 %attr(-, root, %{daemon_group}) /etc/init.d/bacula-dir
 %attr(-, root, %{daemon_group}) /etc/init.d/bacula-fd
 %attr(-, root, %{storage_daemon_group}) %{script_dir}/dvd-handler
 %attr(-, root, %{storage_daemon_group}) /etc/init.d/bacula-sd
 %attr(-, root, %{storage_daemon_group}) %{script_dir}/mtx-changer
+%attr(-, root, %{storage_daemon_group}) %{script_dir}/mtx-changer.conf
 
 /etc/logrotate.d/bacula
 /etc/log.d/scripts/services/bacula
@@ -1872,6 +1977,7 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %{_sbindir}/bacula-dir
 %{_sbindir}/bacula-fd
 %{_sbindir}/bacula-sd
+%{_sbindir}/bacula
 %{_sbindir}/bcopy
 %{_sbindir}/bextract
 %{_sbindir}/bls
@@ -1896,20 +2002,25 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 %{_mandir}/man8/btraceback.8.%{manpage_ext}
 %{_mandir}/man8/dbcheck.8.%{manpage_ext}
 %{_mandir}/man1/bsmtp.1.%{manpage_ext}
+%{_libdir}/libbac*
+%endif
+
+%if ! %{client_only} && %{rescue}
+%attr(-, root, %{daemon_group}) %{script_dir}/rescue
 %endif
 
 %if ! %{client_only} && ! %{single_dir}
-%doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
+%doc COPYING ChangeLog ReleaseNotes LICENSE VERIFYING kernstodo 
 %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt
 %endif
 
-%if %{single_dir}
+%if ! %{client_only} && %{single_dir}
 %{_prefix}/doc
 %endif
 
 %if %{mysql}
 %pre mysql
-# test for bacula database older than version 9
+# test for bacula database older than version 10
 # note: this ASSUMES no password has been set for bacula database
 DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1`
 %endif
@@ -1938,7 +2049,7 @@ if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite ];then
 	echo "chown bacula.bacula bacula.db"
 	exit 1
 fi
-# test for bacula database older than version 9 and sqlite3
+# test for bacula database older than version 10 and sqlite3
 if [ -s %{working_dir}/bacula.db ] && [ -s %{sqlite_bindir}/sqlite3 ];then
         DB_VER=`echo "select * from Version;" | %{sqlite_bindir}/sqlite3 2>/dev/null %{working_dir}/bacula.db | tail -n 1`
 %endif
@@ -1949,13 +2060,13 @@ DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head
 %endif
 
 %if ! %{client_only}
-if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "9" ]; then
-        echo "This bacula upgrade will update a bacula database from version 9 to 10."
+if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "10" ]; then
+        echo "This bacula upgrade will update a bacula database from version 10 to 11."
         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 "your database to version 10 and then install this upgrade. The alternative"
 	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."
+        echo "database older than version 10 can be found in the release notes."
         exit 1
 fi
 %endif
@@ -2055,8 +2166,8 @@ if [ -z "$DB_VER" ]; then
         echo "Creating bacula 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
+# check to see if we need to upgrade a 2.x database
+elif [ "$DB_VER" -lt "11" ]; then
         echo "This release requires an upgrade to your bacula database."
         echo "Backing up your current database..."
         mysqldump -f --opt bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2
@@ -2071,8 +2182,8 @@ fi
 # test for an existing database
 if [ -s %{working_dir}/bacula.db ]; then
         DB_VER=`echo "select * from Version;" | %{sqlite_bindir}/sqlite3 2>/dev/null %{working_dir}/bacula.db | tail -n 1`
-        # check to see if we need to upgrade a 1.38 or lower database
-        if [ "$DB_VER" -lt "10" ] && [ "$DB_VER" -ge "9" ]; then
+        # check to see if we need to upgrade a 2.x database
+        if [ "$DB_VER" -lt "11" ] && [ "$DB_VER" -ge "10" ]; then
                 echo "This release requires an upgrade to your bacula database."
                 echo "Backing up your current database..."
                 echo ".dump" | %{sqlite_bindir}/sqlite3 %{working_dir}/bacula.db | bzip2 > %{working_dir}/bacula_backup.sql.bz2
@@ -2106,8 +2217,8 @@ if [ -z "$DB_VER" ]; then
         echo "Granting privileges for PostgreSQL user bacula..."
 	%{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
+# check to see if we need to upgrade a 2.x database
+elif [ "$DB_VER" -lt "11" ]; then
         echo "This release requires an upgrade to your bacula database."
         echo "Backing up your current database..."
         pg_dump bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2
@@ -2135,6 +2246,8 @@ if [ -d %{sysconf_dir} ]; then
 fi
 %endif
 
+/sbin/ldconfig
+
 %if %{mysql}
 %preun mysql
 %endif
@@ -2154,15 +2267,26 @@ if [ $1 = 0 ]; then
 fi
 %endif
 
+%if %{mysql}
+%postun mysql
+%endif
+%if %{sqlite}
+%postun sqlite
+%endif
+%if %{postgresql}
+%postun postgresql
+%endif
+
+/sbin/ldconfig
+
 
-%if ! %{client_only} && %{mtx} && ! %{single_dir}
+%if ! %{client_only} && %{mtx}
 %files mtx
 %defattr(-,root,root)
 %attr(-, root, %{storage_daemon_group}) %{_sbindir}/loaderinfo
 %attr(-, root, %{storage_daemon_group}) %{_sbindir}/mtx
 %attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsitape
 %attr(-, root, %{storage_daemon_group}) %{_sbindir}/tapeinfo
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/nsmhack
 %attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsieject
 %{_mandir}/man1/loaderinfo.1.%{manpage_ext}
 %{_mandir}/man1/mtx.1.%{manpage_ext}
@@ -2171,31 +2295,17 @@ fi
 %{_mandir}/man1/scsieject.1.%{manpage_ext}
 %endif
 
-%if ! %{client_only} && %{mtx} && %{single_dir}
-%files mtx
-%defattr(-,root,root)
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/loaderinfo
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/mtx
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsitape
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/tapeinfo
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/nsmhack
-%attr(-, root, %{storage_daemon_group}) %{_sbindir}/scsieject
-%{_mandir}/man1/loaderinfo.1
-%{_mandir}/man1/mtx.1
-%{_mandir}/man1/scsitape.1
-%{_mandir}/man1/tapeinfo.1
-%{_mandir}/man1/scsieject.1
-%endif
-
 %files client
 %defattr(-,root,root)
 %attr(-, root, %{daemon_group}) %dir %{script_dir}
 %{script_dir}/bacula-ctl-fd
 /etc/init.d/bacula-fd
+%if %{rescue}
 %attr(-, root, %{daemon_group}) %{script_dir}/rescue
+%endif
 
 %if ! %{single_dir}
-%doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo 
+%doc COPYING ChangeLog ReleaseNotes LICENSE VERIFYING kernstodo 
 %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt
 %else
 %{_prefix}/doc
@@ -2217,6 +2327,7 @@ fi
 %{_mandir}/man8/bacula.8.%{manpage_ext}
 %{_mandir}/man8/bconsole.8.%{manpage_ext}
 %{_mandir}/man8/btraceback.8.%{manpage_ext}
+%{_libdir}/libbac*
 
 
 %pre client
@@ -2263,12 +2374,17 @@ if [ -d %{sysconf_dir} ]; then
         done
 fi
 
+/sbin/ldconfig
+
 %preun client
 # delete our link
 if [ $1 = 0 ]; then
 /sbin/chkconfig --del bacula-fd
 fi
 
+%postun client
+/sbin/ldconfig
+
 %if ! %{client_only}
 %files updatedb
 %defattr(-,root,%{daemon_group})
@@ -2307,7 +2423,7 @@ echo "The database update scripts were installed to %{script_dir}/updatedb"
 %{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext}
 %endif
 
-%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110}
+%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{su111}
 # add the console helper files
 %config(noreplace,missingok) /etc/pam.d/bgnome-console
 %config(noreplace,missingok) /etc/security/console.apps/bgnome-console
@@ -2352,7 +2468,7 @@ fi
 %{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext}
 %endif
 
-%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110}
+%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{su111}
 # add the console helper files
 %config(noreplace,missingok) /etc/pam.d/bwx-console
 %config(noreplace,missingok) /etc/security/console.apps/bwx-console
@@ -2397,7 +2513,7 @@ fi
 %{_mandir}/man1/bat.1.%{manpage_ext}
 %endif
 
-%if %{bat} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110}
+%if %{bat} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{su111}
 # add the console helper files
 %config(noreplace,missingok) /etc/pam.d/bat
 %config(noreplace,missingok) /etc/security/console.apps/bat
@@ -2432,6 +2548,20 @@ fi
 %endif
 
 %changelog
+* Sun Apr 5 2009 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 3.0.0 release
+- database update version 10 to 11
+- make now installs docs so we rm from buildroot
+- add shared libs in %_libdir and other misc new files
+* Wed Dec 31 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add su111 target
+* Sat Nov 08 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- set paths for QT using pkgconfig
+* Sat Oct 11 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- release 2.4.3 update depkgs to 11Sep08 remove file nmshack from mtx package
+* Sun Sep 07 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- adjust /opt/bacula install
+- add build switch to supress rescue package
 * Sun Aug 24 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add support for install to /opt/bacula
 * Sun Aug 17 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>