From: Scott Barninger <scott@barninger.com>
Date: Tue, 1 Mar 2005 20:57:10 +0000 (+0000)
Subject: Fix dist detection.
X-Git-Tag: Release-7.0.0~8951
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4775bee5a922c2b86896877ab920b85c4ec3c03e;p=bacula%2Fbacula

Fix dist detection.


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

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index d1d9c83e03..080bc02ec8 100644
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -64,9 +64,15 @@ exit 1
 %endif
 
 # check what distribution we are
-%if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3}
+%if %{rh7} || %{rh8} || %{rh9}
 %define _dist %(grep Red /etc/redhat-release)
 %endif
+%if %{fc1} || %{fc3}
+%define _dist %(grep Fedora /etc/redhat-release)
+%endif
+%if %{wb3}
+%define _dist %(grep White /etc/whitebox-release)
+%endif
 %if %{su9}
 %define _dist %(grep SuSE /etc/SuSE-release)
 %endif
@@ -1209,6 +1215,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Mon Feb 28 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix distribution check for Fedora and Whitebox
 * Sun Feb 06 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add logwatch script
 - add dvd scripts
diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index d1d9c83e03..080bc02ec8 100644
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -64,9 +64,15 @@ exit 1
 %endif
 
 # check what distribution we are
-%if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3}
+%if %{rh7} || %{rh8} || %{rh9}
 %define _dist %(grep Red /etc/redhat-release)
 %endif
+%if %{fc1} || %{fc3}
+%define _dist %(grep Fedora /etc/redhat-release)
+%endif
+%if %{wb3}
+%define _dist %(grep White /etc/whitebox-release)
+%endif
 %if %{su9}
 %define _dist %(grep SuSE /etc/SuSE-release)
 %endif
@@ -1209,6 +1215,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Mon Feb 28 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix distribution check for Fedora and Whitebox
 * Sun Feb 06 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add logwatch script
 - add dvd scripts
diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index d1d9c83e03..080bc02ec8 100644
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -64,9 +64,15 @@ exit 1
 %endif
 
 # check what distribution we are
-%if %{rh7} || %{rh8} || %{rh9} || %{fc1} || %{fc3} || %{wb3}
+%if %{rh7} || %{rh8} || %{rh9}
 %define _dist %(grep Red /etc/redhat-release)
 %endif
+%if %{fc1} || %{fc3}
+%define _dist %(grep Fedora /etc/redhat-release)
+%endif
+%if %{wb3}
+%define _dist %(grep White /etc/whitebox-release)
+%endif
 %if %{su9}
 %define _dist %(grep SuSE /etc/SuSE-release)
 %endif
@@ -1209,6 +1215,8 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Mon Feb 28 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix distribution check for Fedora and Whitebox
 * Sun Feb 06 2005 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add logwatch script
 - add dvd scripts