From: Scott Barninger <scott@barninger.com>
Date: Sat, 8 Sep 2007 11:58:58 +0000 (+0000)
Subject: Turn off batch-insert for older platforms. Add build target for rhel5 and
X-Git-Tag: Release-7.0.0~5714
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=08577d4cb0219c3723962c610e84defdf9c59321;p=bacula%2Fbacula

Turn off batch-insert for older platforms. Add build target for rhel5 and
clones.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5499 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index d0d146aaa1..9764ddc218 100644
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -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}
@@ -1145,6 +1154,9 @@ make
 %endif
 %if %{client_only}
 	--enable-client-only \
+%if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3} 
+	--disable-batch-insert \
+%endif
 %endif
 	--mandir=%{_mandir} \
         --with-subsys-dir=/var/lock/subsys \
@@ -2008,6 +2020,9 @@ fi
 %endif
 
 %changelog
+* 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
diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index d0d146aaa1..9764ddc218 100644
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -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}
@@ -1145,6 +1154,9 @@ make
 %endif
 %if %{client_only}
 	--enable-client-only \
+%if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3} 
+	--disable-batch-insert \
+%endif
 %endif
 	--mandir=%{_mandir} \
         --with-subsys-dir=/var/lock/subsys \
@@ -2008,6 +2020,9 @@ fi
 %endif
 
 %changelog
+* 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
diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index d0d146aaa1..9764ddc218 100644
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -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}
@@ -1145,6 +1154,9 @@ make
 %endif
 %if %{client_only}
 	--enable-client-only \
+%if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3} 
+	--disable-batch-insert \
+%endif
 %endif
 	--mandir=%{_mandir} \
         --with-subsys-dir=/var/lock/subsys \
@@ -2008,6 +2020,9 @@ fi
 %endif
 
 %changelog
+* 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