1.38.5 rpm update, fix usermode required on suse, refix SLES9 compat on _dist tag...

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

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index b211d2e6f7122c5d0d28f72c0e687497bffab2ca..f5ef75bb5933f513e3b14cd177911699db64fb81 100644 (file)
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -113,7 +113,7 @@ exit 1
 %define _dist %(grep White /etc/whitebox-release)
 %endif
 %if %{su9}
-%define _dist %(grep SuSE /etc/SuSE-release)
+%define _dist %(grep -i SuSE /etc/SuSE-release)
 %endif
 %if %{mdk}
 %define _dist %(grep Mandrake /etc/mandrake-release)
@@ -404,8 +404,7 @@ database.
 %package gconsole
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
-Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd
-Requires: usermode, openssl
+Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd, openssl
 %endif
 
 %if %{gconsole} && %{su9}
@@ -461,6 +460,9 @@ Requires: freetype
 %if %{gconsole} && %{su9}
 Requires: xsu
 %endif
+%if %{gconsole} && ! %{su9}
+Requires: usermode
+%endif
 
 %if %{gconsole}
 %description gconsole
@@ -724,6 +726,10 @@ chmod 644 $RPM_BUILD_ROOT/etc/bacula/tray-monitor.conf
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 
 
+# Note to Kern and Aleksandar: I'm leveing this for now but this is very bad
+# practice to specify permissions per previous discussion with Michael Johnson.
+# The build should take care of the 0750 etc.
+
 %if %{mysql}
 # MySQL specific files
 %files mysql
@@ -1154,6 +1160,12 @@ fi
 %endif
 
 %changelog
+* Sat Jan 21 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 1.38.5 release
+- fix usermode required on suse, suse doesn't have usermode (xsu instead)
+- refix compat for _dist on SLES9 which seems to have been removed
+- added note regarding Aleksandar's use of specific permissions in attrib macros
+- need to review and add specific fc4 build currently using fc3 Requires
 * Wed Dec 14 2005 Aleksandar Milivojevic <alex@milivojevic.org>
 - 1.38.2 release
 - Reorganize files and pre/post sections to remove repetitions

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index b211d2e6f7122c5d0d28f72c0e687497bffab2ca..f5ef75bb5933f513e3b14cd177911699db64fb81 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -113,7 +113,7 @@ exit 1
 %define _dist %(grep White /etc/whitebox-release)
 %endif
 %if %{su9}
-%define _dist %(grep SuSE /etc/SuSE-release)
+%define _dist %(grep -i SuSE /etc/SuSE-release)
 %endif
 %if %{mdk}
 %define _dist %(grep Mandrake /etc/mandrake-release)
@@ -404,8 +404,7 @@ database.
 %package gconsole
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
-Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd
-Requires: usermode, openssl
+Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd, openssl
 %endif
 
 %if %{gconsole} && %{su9}
@@ -461,6 +460,9 @@ Requires: freetype
 %if %{gconsole} && %{su9}
 Requires: xsu
 %endif
+%if %{gconsole} && ! %{su9}
+Requires: usermode
+%endif
 
 %if %{gconsole}
 %description gconsole
@@ -724,6 +726,10 @@ chmod 644 $RPM_BUILD_ROOT/etc/bacula/tray-monitor.conf
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 
 
+# Note to Kern and Aleksandar: I'm leveing this for now but this is very bad
+# practice to specify permissions per previous discussion with Michael Johnson.
+# The build should take care of the 0750 etc.
+
 %if %{mysql}
 # MySQL specific files
 %files mysql
@@ -1154,6 +1160,12 @@ fi
 %endif
 
 %changelog
+* Sat Jan 21 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 1.38.5 release
+- fix usermode required on suse, suse doesn't have usermode (xsu instead)
+- refix compat for _dist on SLES9 which seems to have been removed
+- added note regarding Aleksandar's use of specific permissions in attrib macros
+- need to review and add specific fc4 build currently using fc3 Requires
 * Wed Dec 14 2005 Aleksandar Milivojevic <alex@milivojevic.org>
 - 1.38.2 release
 - Reorganize files and pre/post sections to remove repetitions

diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index b211d2e6f7122c5d0d28f72c0e687497bffab2ca..f5ef75bb5933f513e3b14cd177911699db64fb81 100644 (file)
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -113,7 +113,7 @@ exit 1
 %define _dist %(grep White /etc/whitebox-release)
 %endif
 %if %{su9}
-%define _dist %(grep SuSE /etc/SuSE-release)
+%define _dist %(grep -i SuSE /etc/SuSE-release)
 %endif
 %if %{mdk}
 %define _dist %(grep Mandrake /etc/mandrake-release)
@@ -404,8 +404,7 @@ database.
 %package gconsole
 Summary: Bacula - The Network Backup Solution
 Group: System Environment/Daemons
-Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd
-Requires: usermode, openssl
+Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd, openssl
 %endif
 
 %if %{gconsole} && %{su9}
@@ -461,6 +460,9 @@ Requires: freetype
 %if %{gconsole} && %{su9}
 Requires: xsu
 %endif
+%if %{gconsole} && ! %{su9}
+Requires: usermode
+%endif
 
 %if %{gconsole}
 %description gconsole
@@ -724,6 +726,10 @@ chmod 644 $RPM_BUILD_ROOT/etc/bacula/tray-monitor.conf
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 
 
+# Note to Kern and Aleksandar: I'm leveing this for now but this is very bad
+# practice to specify permissions per previous discussion with Michael Johnson.
+# The build should take care of the 0750 etc.
+
 %if %{mysql}
 # MySQL specific files
 %files mysql
@@ -1154,6 +1160,12 @@ fi
 %endif
 
 %changelog
+* Sat Jan 21 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- 1.38.5 release
+- fix usermode required on suse, suse doesn't have usermode (xsu instead)
+- refix compat for _dist on SLES9 which seems to have been removed
+- added note regarding Aleksandar's use of specific permissions in attrib macros
+- need to review and add specific fc4 build currently using fc3 Requires
 * Wed Dec 14 2005 Aleksandar Milivojevic <alex@milivojevic.org>
 - 1.38.2 release
 - Reorganize files and pre/post sections to remove repetitions