From: Scott Barninger <scott@barninger.com>
Date: Sun, 6 Mar 2005 17:37:41 +0000 (+0000)
Subject: Add build switch for rhel3
X-Git-Tag: Release-7.0.0~8937
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=19bc0dc95e9c78267e843fc6d39c335979134493;p=bacula%2Fbacula

Add build switch for rhel3


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

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index 4d47ad6bcf..0f5322ce23 100644
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -28,11 +28,13 @@
 %define fc3 0
 %{?build_fc3:%define fc3 1}
 # Whitebox Enterprise build
-# this should also work for RHEL
 %define wb3 0
 %{?build_wb3:%define wb3 1}
+# RedHat Enterprise build
+%define rhel3 0
+%{?build_rhel3:%define rhel3 1}
+%{?build_rhel3:%define wb3 1}
 # SuSE build
-# this is known to build on SuSE 8.2 and 9.0
 %define su9 0
 %{?build_su9:%define su9 1}
 # Mandrake build
@@ -50,6 +52,7 @@ exit 1
 %define mysql 0
 %{?build_mysql:%define mysql 1}
 # if using mysql 4.x define this and mysql above
+# currently only Mandrake 10.1 uses this
 %define mysql4 0
 %{?build_mysql4:%define mysql4 1}
 %define sqlite 0
@@ -64,13 +67,13 @@ exit 1
 %endif
 
 # check what distribution we are
-%if %{rh7} || %{rh8} || %{rh9}
+%if %{rh7} || %{rh8} || %{rh9} || %{rhel3}
 %define _dist %(grep Red /etc/redhat-release)
 %endif
 %if %{fc1} || %{fc3}
 %define _dist %(grep Fedora /etc/redhat-release)
 %endif
-%if %{wb3}
+%if %{wb3} && ! %{rhel3}
 %define _dist %(grep White /etc/whitebox-release)
 %endif
 %if %{su9}
@@ -1215,6 +1218,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sun Mar 06 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add rhel3 build tag
 * Tue Mar 01 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - fix tray-monitor.conf for noreplace
 * Mon Feb 28 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 4d47ad6bcf..0f5322ce23 100644
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -28,11 +28,13 @@
 %define fc3 0
 %{?build_fc3:%define fc3 1}
 # Whitebox Enterprise build
-# this should also work for RHEL
 %define wb3 0
 %{?build_wb3:%define wb3 1}
+# RedHat Enterprise build
+%define rhel3 0
+%{?build_rhel3:%define rhel3 1}
+%{?build_rhel3:%define wb3 1}
 # SuSE build
-# this is known to build on SuSE 8.2 and 9.0
 %define su9 0
 %{?build_su9:%define su9 1}
 # Mandrake build
@@ -50,6 +52,7 @@ exit 1
 %define mysql 0
 %{?build_mysql:%define mysql 1}
 # if using mysql 4.x define this and mysql above
+# currently only Mandrake 10.1 uses this
 %define mysql4 0
 %{?build_mysql4:%define mysql4 1}
 %define sqlite 0
@@ -64,13 +67,13 @@ exit 1
 %endif
 
 # check what distribution we are
-%if %{rh7} || %{rh8} || %{rh9}
+%if %{rh7} || %{rh8} || %{rh9} || %{rhel3}
 %define _dist %(grep Red /etc/redhat-release)
 %endif
 %if %{fc1} || %{fc3}
 %define _dist %(grep Fedora /etc/redhat-release)
 %endif
-%if %{wb3}
+%if %{wb3} && ! %{rhel3}
 %define _dist %(grep White /etc/whitebox-release)
 %endif
 %if %{su9}
@@ -1215,6 +1218,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sun Mar 06 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add rhel3 build tag
 * Tue Mar 01 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - fix tray-monitor.conf for noreplace
 * Mon Feb 28 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index 4d47ad6bcf..0f5322ce23 100644
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -28,11 +28,13 @@
 %define fc3 0
 %{?build_fc3:%define fc3 1}
 # Whitebox Enterprise build
-# this should also work for RHEL
 %define wb3 0
 %{?build_wb3:%define wb3 1}
+# RedHat Enterprise build
+%define rhel3 0
+%{?build_rhel3:%define rhel3 1}
+%{?build_rhel3:%define wb3 1}
 # SuSE build
-# this is known to build on SuSE 8.2 and 9.0
 %define su9 0
 %{?build_su9:%define su9 1}
 # Mandrake build
@@ -50,6 +52,7 @@ exit 1
 %define mysql 0
 %{?build_mysql:%define mysql 1}
 # if using mysql 4.x define this and mysql above
+# currently only Mandrake 10.1 uses this
 %define mysql4 0
 %{?build_mysql4:%define mysql4 1}
 %define sqlite 0
@@ -64,13 +67,13 @@ exit 1
 %endif
 
 # check what distribution we are
-%if %{rh7} || %{rh8} || %{rh9}
+%if %{rh7} || %{rh8} || %{rh9} || %{rhel3}
 %define _dist %(grep Red /etc/redhat-release)
 %endif
 %if %{fc1} || %{fc3}
 %define _dist %(grep Fedora /etc/redhat-release)
 %endif
-%if %{wb3}
+%if %{wb3} && ! %{rhel3}
 %define _dist %(grep White /etc/whitebox-release)
 %endif
 %if %{su9}
@@ -1215,6 +1218,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Sun Mar 06 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add rhel3 build tag
 * Tue Mar 01 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - fix tray-monitor.conf for noreplace
 * Mon Feb 28 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>