Add Fedora 9 target.

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

diff --git a/bacula/platforms/contrib-rpm/build_rpm.sh b/bacula/platforms/contrib-rpm/build_rpm.sh
index c36f7218d76103550f6c735cd9bf8aad67101a52..eb59eafda642528e67007a2c64047fd5e587eb22 100755 (executable)
--- a/bacula/platforms/contrib-rpm/build_rpm.sh
+++ b/bacula/platforms/contrib-rpm/build_rpm.sh
@@ -25,11 +25,11 @@ VERSION=2.2.8
 RELEASE=1
 
 # build platform for spec
-# set to one of rh7,rh8,rh9,fc1,fc3,fc4,fc5,fc6,fc7,fc8,wb3,rhel3,rhel4,rhel5,centos3,centos4,centos5,sl3, sl4,sl5,su9,su10,su102,su103,mdk,mdv
+# set to one of rh7,rh8,rh9,fc1,fc3,fc4,fc5,fc6,fc7,fc8,fc9,wb3,rhel3,rhel4,rhel5,centos3,centos4,centos5,sl3, sl4,sl5,su9,su10,su102,su103,mdk,mdv
 PLATFORM=su102
 
 # platform designator for file names
-# for RedHat/Fedora set to one of rh7,rh8,rh9,fc1,fc3,fc4,fc5,fc6,fc7,fc8 OR
+# for RedHat/Fedora set to one of rh7,rh8,rh9,fc1,fc3,fc4,fc5,fc6,fc7,fc8,fc9 OR
 # for RHEL3/clones wb3, rhel3, sl3 & centos3 set to el3 OR
 # for RHEL4/clones rhel4, sl4 & centos4 set to el4 OR
 # for RHEL5/clones rhel5, sl5 & centos5 set to el5 OR
@@ -183,3 +183,4 @@ ls
 # 15 Sep 2007 add rhel5 and clones
 # 10 Nov 2007 add su103
 # 12 Jan 2008 add fc8
+# 23 May 2008 add fc9

diff --git a/bacula/platforms/contrib-rpm/rpm_wizard.sh b/bacula/platforms/contrib-rpm/rpm_wizard.sh
index 5ad266db63a83d66c3995e189143d2c0c8046033..a95182ac49bd12f7e1b4b96bdf076d51b120e071 100755 (executable)
--- a/bacula/platforms/contrib-rpm/rpm_wizard.sh
+++ b/bacula/platforms/contrib-rpm/rpm_wizard.sh
@@ -38,7 +38,7 @@ then
 fi
 
 # select build platform
-PLATFORM=`zenity --title "Select Platform" --text "Please choose a build platform." --list --radiolist --column "Select" --column "Platform" False rh7 False rh8 False rh9 False fc1 False fc3 False fc4 False fc5 False fc6 False fc7 False fc8 False wb3 False rhel3 False rhel4 False rhel5 False centos3 False centos4 False centos5 False sl3 False sl4 False sl5 False su9 False su10 False su102 False su103 False mdk False mdv`
+PLATFORM=`zenity --title "Select Platform" --text "Please choose a build platform." --list --radiolist --column "Select" --column "Platform" False rh7 False rh8 False rh9 False fc1 False fc3 False fc4 False fc5 False fc6 False fc7 False fc8 False fc9 False wb3 False rhel3 False rhel4 False rhel5 False centos3 False centos4 False centos5 False sl3 False sl4 False sl5 False su9 False su10 False su102 False su103 False mdk False mdv`
 
 RESULT="$?"
 if [ "$RESULT" = "1" ];
@@ -115,3 +115,4 @@ echo $COMMAND | sh
 # 06 May 2007 add fc7 target
 # 10 Nov 2007 add rhel5 and su103 targets
 # 12 Jan 2008 add fc8 target
+# 23 May 2008 add fc9 target

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 9942e4bf73826ac57fdceb2fad4f3d586d84b4ef..e1d95378b26761488eaba7b59379a5370e98d1c6 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -5,7 +5,7 @@
 
 # basic defines for every build
 %define _version @VERSION@
-%define _release 2
+%define _release 1
 %define depkgs_version 22Feb08
 %define _rescuever @VERSION@
 %define docs_version @VERSION@
@@ -101,6 +101,8 @@ Packager: %{_packager}
 %{?build_fc7:%define fc7 1}
 %define fc8 0
 %{?build_fc8:%define fc8 1}
+%define fc9 0
+%{?build_fc9:%define fc9 1}
 # Whitebox Enterprise build
 %define wb3 0
 %{?build_wb3:%define wb3 1}
@@ -155,7 +157,7 @@ Packager: %{_packager}
 %{?build_client_only:%define client_only 1}
 
 # test for a platform definition
-%if !%{rh7} && !%{rh8} && !%{rh9} && !%{fc1} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk}
+%if !%{rh7} && !%{rh8} && !%{rh9} && !%{fc1} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk}
 %{error: You must specify a platform. Please examine the spec file.}
 exit 1
 %endif
@@ -203,7 +205,7 @@ exit 1
 %if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} || %{rhel5}
 %define _dist %(grep Red /etc/redhat-release)
 %endif
-%if %{fc1} || %{fc4} || %{fc5} || %{fc7} || %{fc8}
+%if %{fc1} || %{fc4} || %{fc5} || %{fc7} || %{fc8} || %{fc9}
 %define _dist %(grep Fedora /etc/redhat-release)
 %endif
 %if %{centos5} || %{centos4} || %{centos3}
@@ -301,7 +303,7 @@ BuildRequires: pkgconfig, pango-devel, atk-devel
 %endif
 
 # Rh qt4 packages don't have a provide for, guess what, qt!
-# still broken in fc8
+# still broken in fc8, ok in fc9
 # so fix for broken rh
 %define broken_rh 0
 %if %{rhel5} || %{centos5} || %{sl5} || %{fc5} || %{fc6} || %{fc7} || %{fc8}
@@ -509,11 +511,26 @@ BuildRequires: libbonoboui-devel >= 2.20
 BuildRequires: GConf2-devel
 BuildRequires: freetype-devel
 %endif
-%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8}
+%if %{fc9}
+BuildRequires: libtermcap-devel
+BuildRequires: glibc-devel >= 2.8
+BuildRequires: zlib-static
+%endif
+%if %{fc9} && %{gconsole}
+BuildRequires: gtk2-devel >= 2.12
+BuildRequires: libgnomeui-devel >= 2.22
+BuildRequires: ORBit2-devel
+BuildRequires: libart_lgpl-devel >= 2.3
+BuildRequires: libbonobo-devel >= 2.22
+BuildRequires: libbonoboui-devel >= 2.22
+BuildRequires: GConf2-devel
+BuildRequires: freetype-devel
+%endif
+%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9}
 BuildRequires: libtermcap-devel
 BuildRequires: glibc-devel >= 2.3
 %endif
-%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && %{gconsole}
+%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && %{gconsole}
 BuildRequires: gtk2-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: ORBit2-devel
@@ -599,7 +616,7 @@ Requires: termcap
 Requires: glibc >= 2.6
 Requires: termcap
 %endif
-%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8}
+%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9}
 Requires: glibc >= 2.3
 Requires: libtermcap
 %endif
@@ -615,6 +632,10 @@ Requires: libtermcap
 Requires: glibc >= 2.7
 Requires: libtermcap
 %endif
+%if %{fc9}
+Requires: glibc >= 2.8
+Requires: libtermcap
+%endif
 
 %if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4} && ! %{mysql5}
 Requires: mysql >= 3.23
@@ -751,7 +772,7 @@ Requires: termcap
 Requires: glibc >= 2.6
 Requires: termcap
 %endif
-%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8}
+%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9}
 Requires: glibc >= 2.3
 Requires: libtermcap
 %endif
@@ -767,6 +788,10 @@ Requires: libtermcap
 Requires: glibc >= 2.7
 Requires: libtermcap
 %endif
+%if %{fc9}
+Requires: glibc >= 2.8
+Requires: libtermcap
+%endif
 
 %if %{python}
 Requires: python >= %{pyver}
@@ -972,7 +997,18 @@ Requires: libbonoboui >= 2.20
 Requires: GConf2
 Requires: freetype
 %endif
-%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8}
+%if %{gconsole} && %{fc9}  
+Requires: gtk2 >= 2.12
+Requires: libgnomeui >= 2.22
+Requires: glibc >= 2.8
+Requires: ORBit2
+Requires: libart_lgpl >= 2.3
+Requires: libbonobo >= 2.22
+Requires: libbonoboui >= 2.22
+Requires: GConf2
+Requires: freetype
+%endif
+%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9}
 Requires: gtk2 >= 2.0
 Requires: libgnomeui >= 2.0
 Requires: glibc >= 2.3
@@ -1056,7 +1092,11 @@ Requires: gtk2 >= 2.10
 Requires: gtk2 >= 2.10
 %endif
 
-%if %{wxconsole} && %{fc7}  
+%if %{wxconsole} && %{fc8}  
+Requires: gtk2 >= 2.12
+%endif
+
+%if %{wxconsole} && %{fc9}  
 Requires: gtk2 >= 2.12
 %endif
 
@@ -1166,6 +1206,18 @@ Requires: libstdc++
 Requires: zlib
 %endif
 
+%if %{bat} && %{fc8}
+Requires: openssl
+Requires: glibc >= 2.8
+Requires: fontconfig
+Requires: freetype
+Requires: libgcc
+Requires: libpng
+Requires: qt4 >= 4.3
+Requires: libstdc++
+Requires: zlib
+%endif
+
 %if %{bat}
 %description bat
 %{blurb}
@@ -1516,7 +1568,7 @@ cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
 cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_icon.png
 cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
 %endif
-%if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{fc5} || %{fc6} || %{fc7} || %{fc8} || %{mdk}
+%if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{fc5} || %{fc6} || %{fc7} || %{fc8} || %{fc9} || %{mdk}
 %define iftrick 1
 %else
 %define iftrick 0
@@ -2235,6 +2287,8 @@ fi
 %endif
 
 %changelog
+* Sat May 24 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add fc9 target
 * Sun Mar 30 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - FHS compatibility changes
 * Sat Feb 16 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>

diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index 9942e4bf73826ac57fdceb2fad4f3d586d84b4ef..e1d95378b26761488eaba7b59379a5370e98d1c6 100644 (file)
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -5,7 +5,7 @@
 
 # basic defines for every build
 %define _version @VERSION@
-%define _release 2
+%define _release 1
 %define depkgs_version 22Feb08
 %define _rescuever @VERSION@
 %define docs_version @VERSION@
@@ -101,6 +101,8 @@ Packager: %{_packager}
 %{?build_fc7:%define fc7 1}
 %define fc8 0
 %{?build_fc8:%define fc8 1}
+%define fc9 0
+%{?build_fc9:%define fc9 1}
 # Whitebox Enterprise build
 %define wb3 0
 %{?build_wb3:%define wb3 1}
@@ -155,7 +157,7 @@ Packager: %{_packager}
 %{?build_client_only:%define client_only 1}
 
 # test for a platform definition
-%if !%{rh7} && !%{rh8} && !%{rh9} && !%{fc1} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk}
+%if !%{rh7} && !%{rh8} && !%{rh9} && !%{fc1} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk}
 %{error: You must specify a platform. Please examine the spec file.}
 exit 1
 %endif
@@ -203,7 +205,7 @@ exit 1
 %if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} || %{rhel5}
 %define _dist %(grep Red /etc/redhat-release)
 %endif
-%if %{fc1} || %{fc4} || %{fc5} || %{fc7} || %{fc8}
+%if %{fc1} || %{fc4} || %{fc5} || %{fc7} || %{fc8} || %{fc9}
 %define _dist %(grep Fedora /etc/redhat-release)
 %endif
 %if %{centos5} || %{centos4} || %{centos3}
@@ -301,7 +303,7 @@ BuildRequires: pkgconfig, pango-devel, atk-devel
 %endif
 
 # Rh qt4 packages don't have a provide for, guess what, qt!
-# still broken in fc8
+# still broken in fc8, ok in fc9
 # so fix for broken rh
 %define broken_rh 0
 %if %{rhel5} || %{centos5} || %{sl5} || %{fc5} || %{fc6} || %{fc7} || %{fc8}
@@ -509,11 +511,26 @@ BuildRequires: libbonoboui-devel >= 2.20
 BuildRequires: GConf2-devel
 BuildRequires: freetype-devel
 %endif
-%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8}
+%if %{fc9}
+BuildRequires: libtermcap-devel
+BuildRequires: glibc-devel >= 2.8
+BuildRequires: zlib-static
+%endif
+%if %{fc9} && %{gconsole}
+BuildRequires: gtk2-devel >= 2.12
+BuildRequires: libgnomeui-devel >= 2.22
+BuildRequires: ORBit2-devel
+BuildRequires: libart_lgpl-devel >= 2.3
+BuildRequires: libbonobo-devel >= 2.22
+BuildRequires: libbonoboui-devel >= 2.22
+BuildRequires: GConf2-devel
+BuildRequires: freetype-devel
+%endif
+%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9}
 BuildRequires: libtermcap-devel
 BuildRequires: glibc-devel >= 2.3
 %endif
-%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && %{gconsole}
+%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && %{gconsole}
 BuildRequires: gtk2-devel >= 2.0
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: ORBit2-devel
@@ -599,7 +616,7 @@ Requires: termcap
 Requires: glibc >= 2.6
 Requires: termcap
 %endif
-%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8}
+%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9}
 Requires: glibc >= 2.3
 Requires: libtermcap
 %endif
@@ -615,6 +632,10 @@ Requires: libtermcap
 Requires: glibc >= 2.7
 Requires: libtermcap
 %endif
+%if %{fc9}
+Requires: glibc >= 2.8
+Requires: libtermcap
+%endif
 
 %if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4} && ! %{mysql5}
 Requires: mysql >= 3.23
@@ -751,7 +772,7 @@ Requires: termcap
 Requires: glibc >= 2.6
 Requires: termcap
 %endif
-%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8}
+%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9}
 Requires: glibc >= 2.3
 Requires: libtermcap
 %endif
@@ -767,6 +788,10 @@ Requires: libtermcap
 Requires: glibc >= 2.7
 Requires: libtermcap
 %endif
+%if %{fc9}
+Requires: glibc >= 2.8
+Requires: libtermcap
+%endif
 
 %if %{python}
 Requires: python >= %{pyver}
@@ -972,7 +997,18 @@ Requires: libbonoboui >= 2.20
 Requires: GConf2
 Requires: freetype
 %endif
-%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8}
+%if %{gconsole} && %{fc9}  
+Requires: gtk2 >= 2.12
+Requires: libgnomeui >= 2.22
+Requires: glibc >= 2.8
+Requires: ORBit2
+Requires: libart_lgpl >= 2.3
+Requires: libbonobo >= 2.22
+Requires: libbonoboui >= 2.22
+Requires: GConf2
+Requires: freetype
+%endif
+%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9}
 Requires: gtk2 >= 2.0
 Requires: libgnomeui >= 2.0
 Requires: glibc >= 2.3
@@ -1056,7 +1092,11 @@ Requires: gtk2 >= 2.10
 Requires: gtk2 >= 2.10
 %endif
 
-%if %{wxconsole} && %{fc7}  
+%if %{wxconsole} && %{fc8}  
+Requires: gtk2 >= 2.12
+%endif
+
+%if %{wxconsole} && %{fc9}  
 Requires: gtk2 >= 2.12
 %endif
 
@@ -1166,6 +1206,18 @@ Requires: libstdc++
 Requires: zlib
 %endif
 
+%if %{bat} && %{fc8}
+Requires: openssl
+Requires: glibc >= 2.8
+Requires: fontconfig
+Requires: freetype
+Requires: libgcc
+Requires: libpng
+Requires: qt4 >= 4.3
+Requires: libstdc++
+Requires: zlib
+%endif
+
 %if %{bat}
 %description bat
 %{blurb}
@@ -1516,7 +1568,7 @@ cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
 cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_icon.png
 cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
 %endif
-%if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{fc5} || %{fc6} || %{fc7} || %{fc8} || %{mdk}
+%if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{fc5} || %{fc6} || %{fc7} || %{fc8} || %{fc9} || %{mdk}
 %define iftrick 1
 %else
 %define iftrick 0
@@ -2235,6 +2287,8 @@ fi
 %endif
 
 %changelog
+* Sat May 24 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add fc9 target
 * Sun Mar 30 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - FHS compatibility changes
 * Sat Feb 16 2008 D. Scott Barninger <barninger@fairfieldcomputers.com>