Fix disable-batch-insert.

[bacula/bacula] / bacula / platforms / mandrake / bacula.spec.in

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index e6d8deb9ce310a0952a147aa4e7032fd3cf69f6e..a636dc991c9ee51fc07df227ed4de557f50f76dc 100644 (file)
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -6,8 +6,8 @@
 # basic defines for every build
 %define _version @VERSION@
 %define _release 1
-%define depkgs_version 04Jan07
-%define _rescuever 2.1.10
+%define depkgs_version 09Sep07
+%define _rescuever @VERSION@
 %define docs_version @VERSION@
 
 # any patches for this release
@@ -109,6 +109,9 @@ Packager: %{_packager}
 %define rhel4 0
 %{?build_rhel4:%define rhel4 1}
 %{?build_rhel4:%define fc3 1}
+%define rhel5 0
+%{?build_rhel5:%define rhel5 1}
+%{?build_rhel5:%define fc6 1}
 # CentOS build
 %define centos3 0
 %{?build_centos3:%define centos3 1}
@@ -116,6 +119,9 @@ Packager: %{_packager}
 %define centos4 0
 %{?build_centos4:%define centos4 1}
 %{?build_centos4:%define fc3 1}
+%define centos5 0
+%{?build_centos5:%define centos5 1}
+%{?build_centos5:%define fc6 1}
 # SL build
 %define sl3 0
 %{?build_sl3:%define sl3 1}
@@ -123,6 +129,9 @@ Packager: %{_packager}
 %define sl4 0
 %{?build_sl4:%define sl4 1}
 %{?build_sl4:%define fc3 1}
+%define sl5 0
+%{?build_sl5:%define sl5 1}
+%{?build_sl5:%define fc6 1}
 # SuSE build
 %define su9 0
 %{?build_su9:%define su9 1}
@@ -187,16 +196,16 @@ exit 1
 %{?build_x86_64:%define x86_64 1}
 
 # check what distribution we are
-%if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4}
+%if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} || %{rhel5}
 %define _dist %(grep Red /etc/redhat-release)
 %endif
 %if %{fc1} || %{fc4} || %{fc5} || %{fc6} || %{fc7}
 %define _dist %(grep Fedora /etc/redhat-release)
 %endif
-%if %{centos4} || %{centos3}
+%if %{centos5} || %{centos4} || %{centos3}
 %define _dist %(grep CentOS /etc/redhat-release)
 %endif
-%if %{sl4} || %{sl3}
+%if %{sl5} ||%{sl4} || %{sl3}
 %define _dist %(grep 'Scientific Linux' /etc/redhat-release)
 %endif
 %if %{fc3} && ! %{rhel4} && ! %{centos4} && ! %{sl4}
@@ -215,9 +224,11 @@ Distribution: %{_dist}
 
 # Should we build gconsole, possible only if gtk= >= 2.4 available.
 # leaving all the BuildRequires and Requires in place below for now.
+# su10, fc3 and fc4 now nobuild, tray monitor fails to build as of 2.2.1 
+# release as it needs 2.10
 
 %define gconsole 1
-%if %{rh7} || %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{su9}
+%if %{rh7} || %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{su9} || %{su10}
 %define gconsole 0
 %endif
 %if %{mdk} && ! %{mdv}
@@ -233,7 +244,7 @@ Distribution: %{_dist}
 %{?build_wxconsole:%define wxconsole 1}
 
 # Should we build bat
-# requires QT4
+# requires >= Qt-4.2
 %define bat 0
 %{?build_bat:%define bat 1}
 
@@ -274,7 +285,7 @@ BuildRequires: python, python-devel
 BuildRequires: pkgconfig, pango-devel, atk-devel
 %endif
 %if %{bat}
-BuildRequires: qt-devel >= 4
+BuildRequires: qt-devel >= 4.2
 %endif
 %if %{rh7}
 BuildRequires: libtermcap-devel
@@ -958,7 +969,7 @@ Requires: fontconfig
 Requires: freetype2
 Requires: libgcc
 Requires: libpng
-Requires: qt >= 4
+Requires: qt >= 4.2
 Requires: libstdc++
 Requires: zlib
 %endif
@@ -970,7 +981,7 @@ Requires: fontconfig
 Requires: freetype2
 Requires: libgcc
 Requires: libpng
-Requires: qt >= 4
+Requires: qt >= 4.2
 Requires: libstdc++
 Requires: zlib
 %endif
@@ -982,7 +993,7 @@ Requires: fontconfig
 Requires: freetype
 Requires: libgcc
 Requires: libpng
-Requires: qt >= 4
+Requires: qt >= 4.2
 Requires: libstdc++
 Requires: zlib
 %endif
@@ -994,7 +1005,7 @@ Requires: fontconfig
 Requires: freetype
 Requires: libgcc
 Requires: libpng
-Requires: qt >= 4
+Requires: qt >= 4.2
 Requires: libstdc++
 Requires: zlib
 %endif
@@ -1006,7 +1017,7 @@ Requires: fontconfig
 Requires: freetype
 Requires: libgcc
 Requires: libpng
-Requires: qt >= 4
+Requires: qt >= 4.2
 Requires: libstdc++
 Requires: zlib
 %endif
@@ -1049,6 +1060,9 @@ make sqlite
 %if ! %{client_only}
 make mtx
 %endif
+%if %{bat}
+make qwt
+%endif
 cd ${cwd}
 
 # patches for the bundled sqlite scripts
@@ -1134,12 +1148,16 @@ make
 %endif
 %if %{bat}
        --enable-bat \
+       --with-qwt=${cwd}/%{depkgs}/qwt \
 %endif
 %if %{python}
        --with-python \
 %endif
 %if %{client_only}
        --enable-client-only \
+%endif
+%if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3} 
+       --disable-batch-insert \
 %endif
        --mandir=%{_mandir} \
         --with-subsys-dir=/var/lock/subsys \
@@ -1755,10 +1773,13 @@ fi
 %attr(-, root, %{storage_daemon_group}) /usr/sbin/mtx
 %attr(-, root, %{storage_daemon_group}) /usr/sbin/scsitape
 %attr(-, root, %{storage_daemon_group}) /usr/sbin/tapeinfo
+%attr(-, root, %{storage_daemon_group}) /usr/sbin/nsmhack
+%attr(-, root, %{storage_daemon_group}) /usr/sbin/scsieject
 %{_mandir}/man1/loaderinfo.1.%{manpage_ext}
 %{_mandir}/man1/mtx.1.%{manpage_ext}
 %{_mandir}/man1/scsitape.1.%{manpage_ext}
 %{_mandir}/man1/tapeinfo.1.%{manpage_ext}
+%{_mandir}/man1/scsieject.1.%{manpage_ext}
 %endif
 
 %files client
@@ -2003,6 +2024,22 @@ fi
 %endif
 
 %changelog
+* Sun Sep 16 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix disable-batch-insert
+* Fri Sep 14 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 2.2.4 release
+- turn off gconsole build for fc3, tray monitor fails to build
+- add new files for mtx package (09Sep07 depkgs update)
+* Sat Sep 08 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add --disable-batch-insert for older platforms
+- add build targets for rhel5 and clones
+* Mon Sep 03 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 2.2.1 release
+- turn off gconsole build for su10 & fc4, tray monitor fails to build
+* Sat Jul 14 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 2.1.26 add make of qwt in depkgs for bat
+* Sat Jun 02 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- upgrade Qt requirement for bat to 4.2
 * Sun May 06 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add fc7 build target
 * Sun Apr 29 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>