From: Scott Barninger Date: Sat, 28 Jun 2008 14:17:50 +0000 (+0000) Subject: Add SuSE-11.0 X-Git-Tag: Release-3.0.0~1215 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aea9d52e70d9f1ca59513e0a5a32bd8fe3bdb229;p=bacula%2Fbacula Add SuSE-11.0 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7252 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/platforms/contrib-rpm/build_rpm.sh b/bacula/platforms/contrib-rpm/build_rpm.sh index c2f1aa0d9b..9f82f26349 100755 --- a/bacula/platforms/contrib-rpm/build_rpm.sh +++ b/bacula/platforms/contrib-rpm/build_rpm.sh @@ -21,21 +21,21 @@ ########################################################################################### # script configuration section -VERSION=2.2.8 +VERSION=2.4.1 RELEASE=1 # build platform for spec -# 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 +# 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,su110,mdk,mdv +PLATFORM=su110 # platform designator for file names # 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 -# for SuSE set to su90, su91, su92, su100 or su101 or su102 or su103 OR +# for SuSE set to su90, su91, su92, su100 or su101 or su102 or su103 or su110 OR # for Mandrake set to 101mdk or 20060mdk -FILENAME=su102 +FILENAME=su110 # MySQL version # set to empty (for MySQL 3), 4 or 5 @@ -188,3 +188,4 @@ ls # 10 Nov 2007 add su103 # 12 Jan 2008 add fc8 # 23 May 2008 add fc9 +# 28 Jun 2008 add su110 diff --git a/bacula/platforms/contrib-rpm/rpm_wizard.sh b/bacula/platforms/contrib-rpm/rpm_wizard.sh index a95182ac49..8598e84aad 100755 --- 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 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` +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 su110 False mdk False mdv` RESULT="$?" if [ "$RESULT" = "1" ]; @@ -116,3 +116,4 @@ echo $COMMAND | sh # 10 Nov 2007 add rhel5 and su103 targets # 12 Jan 2008 add fc8 target # 23 May 2008 add fc9 target +# 28 Jun 2008 add su110 target diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index 9942e4bf73..4f2e65c446 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/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} @@ -143,6 +145,8 @@ Packager: %{_packager} %{?build_su102:%define su102 1} %define su103 0 %{?build_su103:%define su103 1} +%define su110 0 +%{?build_su110:%define su110 1} # Mandrake builds %define mdk 0 %{?build_mdk:%define mdk 1} @@ -155,7 +159,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} && !%{su110} && !%{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -203,7 +207,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} @@ -221,7 +225,7 @@ exit 1 %if %{wb3} && ! %{rhel3} && ! %{centos3} && ! %{sl3} %define _dist %(grep White /etc/whitebox-release) %endif -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} %define _dist %(grep -i SuSE /etc/SuSE-release) %endif %if %{mdk} @@ -301,7 +305,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} @@ -395,6 +399,26 @@ BuildRequires: fontconfig-devel >= 2.4 BuildRequires: gnome-vfs2-devel >= 2.20 BuildRequires: libpng-devel %endif +%if %{su110} +BuildRequires: termcap +BuildRequires: glibc-devel >= 2.8 +%endif +%if %{su110} && %{gconsole} +BuildRequires: libgnome >= 2.22 +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: bonobo-activation-devel +BuildRequires: gconf2-devel +BuildRequires: freetype2-devel +BuildRequires: cairo-devel +BuildRequires: fontconfig-devel >= 2.4 +BuildRequires: gnome-vfs2-devel >= 2.22 +BuildRequires: libpng-devel +%endif %if %{mdk} BuildRequires: libtermcap-devel BuildRequires: libstdc++-static-devel @@ -509,11 +533,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} && !%{su110} && !%{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} && !%{su110} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: ORBit2-devel @@ -577,7 +616,7 @@ Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server Conflicts: bacula-client Obsoletes: bacula-rescue -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} Conflicts: bacula %endif @@ -599,7 +638,11 @@ Requires: termcap Requires: glibc >= 2.6 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} +%if %{su110} +Requires: glibc >= 2.8 +Requires: termcap +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -615,6 +658,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 @@ -624,7 +671,7 @@ Requires: mysql-server >= 3.23 Requires: mysql >= 4.0 Requires: mysql-server >= 4.0 %endif -%if %{mysql} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{mdk} && %{mysql5} +%if %{mysql} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{mdk} && %{mysql5} Requires: mysql >= 5.0 Requires: mysql-server >= 5.0 %endif @@ -653,6 +700,10 @@ Requires: mysql-client >= 5.0 Requires: mysql >= 5.0 Requires: mysql-client >= 5.0 %endif +%if %{mysql} && %{su110} && %{mysql5} +Requires: mysql >= 5.0 +Requires: mysql-client >= 5.0 +%endif %if %{mysql} && %{mdk} && ! %{mysql4} Requires: mysql >= 3.23 @@ -729,7 +780,7 @@ Conflicts: bacula-sqlite Conflicts: bacula-postgresql Obsoletes: bacula-rescue -%if %{su9} || %{su10} || %{su102} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} Provides: bacula %endif @@ -751,7 +802,11 @@ Requires: termcap Requires: glibc >= 2.6 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} +%if %{su110} +Requires: glibc >= 2.8 +Requires: termcap +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -767,6 +822,10 @@ Requires: libtermcap Requires: glibc >= 2.7 Requires: libtermcap %endif +%if %{fc9} +Requires: glibc >= 2.8 +Requires: libtermcap +%endif %if %{python} Requires: python >= %{pyver} @@ -882,6 +941,23 @@ Requires: fontconfig >= 2.4 Requires: gnome-vfs2 >= 2.20 Requires: libpng %endif +%if %{gconsole} && %{su110} +Requires: gtk2 >= 2.12 +Requires: libgnome >= 2.22 +Requires: libgnomeui >= 2.22 +Requires: glibc >= 2.8 +Requires: ORBit2 +Requires: libart_lgpl >= 2.3 +Requires: libbonobo >= 2.22 +Requires: libbonoboui >= 2.22 +Requires: bonobo-activation +Requires: gconf2 +Requires: freetype2 +Requires: cairo +Requires: fontconfig >= 2.4 +Requires: gnome-vfs2 >= 2.22 +Requires: libpng +%endif %if %{gconsole} && %{mdk} && !%{mdv} Requires: gtk2 >= 2.0 Requires: libgnomeui2 @@ -972,7 +1048,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} && !%{su110} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -997,7 +1084,10 @@ Requires: xsu %if %{gconsole} && %{su103} Requires: xsu %endif -%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{gconsole} && %{su110} +Requires: xsu +%endif +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} Requires: usermode %endif @@ -1036,6 +1126,10 @@ Requires: gtk2 >= 2.10 Requires: gtk2 >= 2.12 %endif +%if %{wxconsole} && %{su110} +Requires: gtk2 >= 2.12 +%endif + %if %{wxconsole} && %{fc3} Requires: gtk2 >= 2.4 %endif @@ -1056,7 +1150,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 @@ -1118,6 +1216,18 @@ Requires: libstdc++ Requires: zlib %endif +%if %{bat} && %{su110} +Requires: openssl +Requires: glibc >= 2.8 +Requires: fontconfig +Requires: freetype2 +Requires: libgcc +Requires: libpng +Requires: qt >= 4.2 +Requires: libstdc++ +Requires: zlib +%endif + %if %{bat} && %{fc5} Requires: openssl Requires: glibc >= 2.4 @@ -1166,6 +1276,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} @@ -1185,7 +1307,7 @@ the client or server packages. # SuSE turns off stripping of binaries by default. In order to get # stripped packages we must generate debug package. RedHat and Mandriva # turn debug packages on by default but strip binaries regardless. -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} %debug_package %endif @@ -1199,7 +1321,7 @@ the client or server packages. %build -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} export LDFLAGS="${LDFLAGS} -L/usr/lib/termcap" %endif @@ -1250,6 +1372,9 @@ patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch %if %{sqlite} && %{su103} patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch %endif +%if %{sqlite} && %{su110} +patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch +%endif # 64 bit lib location hacks # as of 1.39.18 it should not be necessary to enable x86_64 as configure is @@ -1371,7 +1496,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps %define usermode_iftrick 0 %endif -%if %{usermode_iftrick} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{usermode_iftrick} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} mkdir -p $RPM_BUILD_ROOT/etc/pam.d mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps mkdir -p $RPM_BUILD_ROOT/usr/bin @@ -1450,7 +1575,7 @@ rm -f $RPM_BUILD_ROOT%{script_dir}/gconsole rm -f $RPM_BUILD_ROOT/usr/sbin/static-bacula-fd # install the init scripts -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} cp -p platforms/suse/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/suse/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/suse/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd @@ -1460,7 +1585,7 @@ cp -p platforms/mandrake/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/mandrake/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/mandrake/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd %endif -%if ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{mdk} +%if ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{mdk} cp -p platforms/redhat/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/redhat/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/redhat/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd @@ -1496,6 +1621,12 @@ cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/b cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif +%if %{gconsole} && %{su110} +cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png +cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop +cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm +cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop +%endif %if %{wxconsole} && %{su10} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop @@ -1508,6 +1639,10 @@ cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxcon cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop %endif +%if %{wxconsole} && %{su110} +cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm +cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop +%endif %if %{bat} && %{su102} 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 @@ -1516,7 +1651,11 @@ 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 %{bat} && %{su110} +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} || %{fc9} || %{mdk} %define iftrick 1 %else %define iftrick 0 @@ -2110,7 +2249,7 @@ echo "The database update scripts were installed to %{script_dir}/updatedb" %{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif -%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} # add the console helper files %config(noreplace,missingok) /etc/pam.d/bgnome-console %config(noreplace,missingok) /etc/security/console.apps/bgnome-console @@ -2155,7 +2294,7 @@ fi %{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext} %endif -%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} # add the console helper files %config(noreplace,missingok) /etc/pam.d/bwx-console %config(noreplace,missingok) /etc/security/console.apps/bwx-console @@ -2200,7 +2339,7 @@ fi %{_mandir}/man1/bat.1.%{manpage_ext} %endif -%if %{bat} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{bat} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} # add the console helper files %config(noreplace,missingok) /etc/pam.d/bat %config(noreplace,missingok) /etc/security/console.apps/bat @@ -2235,6 +2374,10 @@ fi %endif %changelog +* Sat Jun 28 2008 D. Scott Barninger +- add su110 target +* Sat May 24 2008 D. Scott Barninger +- add fc9 target * Sun Mar 30 2008 D. Scott Barninger - FHS compatibility changes * Sat Feb 16 2008 D. Scott Barninger diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index e1d95378b2..4f2e65c446 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -145,6 +145,8 @@ Packager: %{_packager} %{?build_su102:%define su102 1} %define su103 0 %{?build_su103:%define su103 1} +%define su110 0 +%{?build_su110:%define su110 1} # Mandrake builds %define mdk 0 %{?build_mdk:%define mdk 1} @@ -157,7 +159,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} && !%{fc9} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} +%if !%{rh7} && !%{rh8} && !%{rh9} && !%{fc1} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -223,7 +225,7 @@ exit 1 %if %{wb3} && ! %{rhel3} && ! %{centos3} && ! %{sl3} %define _dist %(grep White /etc/whitebox-release) %endif -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} %define _dist %(grep -i SuSE /etc/SuSE-release) %endif %if %{mdk} @@ -397,6 +399,26 @@ BuildRequires: fontconfig-devel >= 2.4 BuildRequires: gnome-vfs2-devel >= 2.20 BuildRequires: libpng-devel %endif +%if %{su110} +BuildRequires: termcap +BuildRequires: glibc-devel >= 2.8 +%endif +%if %{su110} && %{gconsole} +BuildRequires: libgnome >= 2.22 +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: bonobo-activation-devel +BuildRequires: gconf2-devel +BuildRequires: freetype2-devel +BuildRequires: cairo-devel +BuildRequires: fontconfig-devel >= 2.4 +BuildRequires: gnome-vfs2-devel >= 2.22 +BuildRequires: libpng-devel +%endif %if %{mdk} BuildRequires: libtermcap-devel BuildRequires: libstdc++-static-devel @@ -526,11 +548,11 @@ 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} +%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{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} && !%{fc9} && %{gconsole} +%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: ORBit2-devel @@ -594,7 +616,7 @@ Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server Conflicts: bacula-client Obsoletes: bacula-rescue -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} Conflicts: bacula %endif @@ -616,7 +638,11 @@ Requires: termcap Requires: glibc >= 2.6 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} +%if %{su110} +Requires: glibc >= 2.8 +Requires: termcap +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -645,7 +671,7 @@ Requires: mysql-server >= 3.23 Requires: mysql >= 4.0 Requires: mysql-server >= 4.0 %endif -%if %{mysql} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{mdk} && %{mysql5} +%if %{mysql} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{mdk} && %{mysql5} Requires: mysql >= 5.0 Requires: mysql-server >= 5.0 %endif @@ -674,6 +700,10 @@ Requires: mysql-client >= 5.0 Requires: mysql >= 5.0 Requires: mysql-client >= 5.0 %endif +%if %{mysql} && %{su110} && %{mysql5} +Requires: mysql >= 5.0 +Requires: mysql-client >= 5.0 +%endif %if %{mysql} && %{mdk} && ! %{mysql4} Requires: mysql >= 3.23 @@ -750,7 +780,7 @@ Conflicts: bacula-sqlite Conflicts: bacula-postgresql Obsoletes: bacula-rescue -%if %{su9} || %{su10} || %{su102} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} Provides: bacula %endif @@ -772,7 +802,11 @@ Requires: termcap Requires: glibc >= 2.6 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} +%if %{su110} +Requires: glibc >= 2.8 +Requires: termcap +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -907,6 +941,23 @@ Requires: fontconfig >= 2.4 Requires: gnome-vfs2 >= 2.20 Requires: libpng %endif +%if %{gconsole} && %{su110} +Requires: gtk2 >= 2.12 +Requires: libgnome >= 2.22 +Requires: libgnomeui >= 2.22 +Requires: glibc >= 2.8 +Requires: ORBit2 +Requires: libart_lgpl >= 2.3 +Requires: libbonobo >= 2.22 +Requires: libbonoboui >= 2.22 +Requires: bonobo-activation +Requires: gconf2 +Requires: freetype2 +Requires: cairo +Requires: fontconfig >= 2.4 +Requires: gnome-vfs2 >= 2.22 +Requires: libpng +%endif %if %{gconsole} && %{mdk} && !%{mdv} Requires: gtk2 >= 2.0 Requires: libgnomeui2 @@ -1008,7 +1059,7 @@ Requires: libbonoboui >= 2.22 Requires: GConf2 Requires: freetype %endif -%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} +%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -1033,7 +1084,10 @@ Requires: xsu %if %{gconsole} && %{su103} Requires: xsu %endif -%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{gconsole} && %{su110} +Requires: xsu +%endif +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} Requires: usermode %endif @@ -1072,6 +1126,10 @@ Requires: gtk2 >= 2.10 Requires: gtk2 >= 2.12 %endif +%if %{wxconsole} && %{su110} +Requires: gtk2 >= 2.12 +%endif + %if %{wxconsole} && %{fc3} Requires: gtk2 >= 2.4 %endif @@ -1158,6 +1216,18 @@ Requires: libstdc++ Requires: zlib %endif +%if %{bat} && %{su110} +Requires: openssl +Requires: glibc >= 2.8 +Requires: fontconfig +Requires: freetype2 +Requires: libgcc +Requires: libpng +Requires: qt >= 4.2 +Requires: libstdc++ +Requires: zlib +%endif + %if %{bat} && %{fc5} Requires: openssl Requires: glibc >= 2.4 @@ -1237,7 +1307,7 @@ the client or server packages. # SuSE turns off stripping of binaries by default. In order to get # stripped packages we must generate debug package. RedHat and Mandriva # turn debug packages on by default but strip binaries regardless. -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} %debug_package %endif @@ -1251,7 +1321,7 @@ the client or server packages. %build -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} export LDFLAGS="${LDFLAGS} -L/usr/lib/termcap" %endif @@ -1302,6 +1372,9 @@ patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch %if %{sqlite} && %{su103} patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch %endif +%if %{sqlite} && %{su110} +patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch +%endif # 64 bit lib location hacks # as of 1.39.18 it should not be necessary to enable x86_64 as configure is @@ -1423,7 +1496,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps %define usermode_iftrick 0 %endif -%if %{usermode_iftrick} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{usermode_iftrick} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} mkdir -p $RPM_BUILD_ROOT/etc/pam.d mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps mkdir -p $RPM_BUILD_ROOT/usr/bin @@ -1502,7 +1575,7 @@ rm -f $RPM_BUILD_ROOT%{script_dir}/gconsole rm -f $RPM_BUILD_ROOT/usr/sbin/static-bacula-fd # install the init scripts -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} cp -p platforms/suse/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/suse/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/suse/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd @@ -1512,7 +1585,7 @@ cp -p platforms/mandrake/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/mandrake/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/mandrake/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd %endif -%if ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{mdk} +%if ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{mdk} cp -p platforms/redhat/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/redhat/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/redhat/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd @@ -1548,6 +1621,12 @@ cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/b cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif +%if %{gconsole} && %{su110} +cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png +cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop +cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm +cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop +%endif %if %{wxconsole} && %{su10} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop @@ -1560,6 +1639,10 @@ cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxcon cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop %endif +%if %{wxconsole} && %{su110} +cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm +cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop +%endif %if %{bat} && %{su102} 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 @@ -1568,6 +1651,10 @@ 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 %{bat} && %{su110} +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} || %{fc9} || %{mdk} %define iftrick 1 %else @@ -2162,7 +2249,7 @@ echo "The database update scripts were installed to %{script_dir}/updatedb" %{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif -%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} # add the console helper files %config(noreplace,missingok) /etc/pam.d/bgnome-console %config(noreplace,missingok) /etc/security/console.apps/bgnome-console @@ -2207,7 +2294,7 @@ fi %{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext} %endif -%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} # add the console helper files %config(noreplace,missingok) /etc/pam.d/bwx-console %config(noreplace,missingok) /etc/security/console.apps/bwx-console @@ -2252,7 +2339,7 @@ fi %{_mandir}/man1/bat.1.%{manpage_ext} %endif -%if %{bat} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{bat} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} # add the console helper files %config(noreplace,missingok) /etc/pam.d/bat %config(noreplace,missingok) /etc/security/console.apps/bat @@ -2287,6 +2374,8 @@ fi %endif %changelog +* Sat Jun 28 2008 D. Scott Barninger +- add su110 target * Sat May 24 2008 D. Scott Barninger - add fc9 target * Sun Mar 30 2008 D. Scott Barninger diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index e1d95378b2..4f2e65c446 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -145,6 +145,8 @@ Packager: %{_packager} %{?build_su102:%define su102 1} %define su103 0 %{?build_su103:%define su103 1} +%define su110 0 +%{?build_su110:%define su110 1} # Mandrake builds %define mdk 0 %{?build_mdk:%define mdk 1} @@ -157,7 +159,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} && !%{fc9} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} +%if !%{rh7} && !%{rh8} && !%{rh9} && !%{fc1} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && !%{wb3} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -223,7 +225,7 @@ exit 1 %if %{wb3} && ! %{rhel3} && ! %{centos3} && ! %{sl3} %define _dist %(grep White /etc/whitebox-release) %endif -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} %define _dist %(grep -i SuSE /etc/SuSE-release) %endif %if %{mdk} @@ -397,6 +399,26 @@ BuildRequires: fontconfig-devel >= 2.4 BuildRequires: gnome-vfs2-devel >= 2.20 BuildRequires: libpng-devel %endif +%if %{su110} +BuildRequires: termcap +BuildRequires: glibc-devel >= 2.8 +%endif +%if %{su110} && %{gconsole} +BuildRequires: libgnome >= 2.22 +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: bonobo-activation-devel +BuildRequires: gconf2-devel +BuildRequires: freetype2-devel +BuildRequires: cairo-devel +BuildRequires: fontconfig-devel >= 2.4 +BuildRequires: gnome-vfs2-devel >= 2.22 +BuildRequires: libpng-devel +%endif %if %{mdk} BuildRequires: libtermcap-devel BuildRequires: libstdc++-static-devel @@ -526,11 +548,11 @@ 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} +%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{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} && !%{fc9} && %{gconsole} +%if !%{rh7} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: ORBit2-devel @@ -594,7 +616,7 @@ Provides: bacula-dir, bacula-sd, bacula-fd, bacula-server Conflicts: bacula-client Obsoletes: bacula-rescue -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} Conflicts: bacula %endif @@ -616,7 +638,11 @@ Requires: termcap Requires: glibc >= 2.6 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} +%if %{su110} +Requires: glibc >= 2.8 +Requires: termcap +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -645,7 +671,7 @@ Requires: mysql-server >= 3.23 Requires: mysql >= 4.0 Requires: mysql-server >= 4.0 %endif -%if %{mysql} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{mdk} && %{mysql5} +%if %{mysql} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{mdk} && %{mysql5} Requires: mysql >= 5.0 Requires: mysql-server >= 5.0 %endif @@ -674,6 +700,10 @@ Requires: mysql-client >= 5.0 Requires: mysql >= 5.0 Requires: mysql-client >= 5.0 %endif +%if %{mysql} && %{su110} && %{mysql5} +Requires: mysql >= 5.0 +Requires: mysql-client >= 5.0 +%endif %if %{mysql} && %{mdk} && ! %{mysql4} Requires: mysql >= 3.23 @@ -750,7 +780,7 @@ Conflicts: bacula-sqlite Conflicts: bacula-postgresql Obsoletes: bacula-rescue -%if %{su9} || %{su10} || %{su102} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} Provides: bacula %endif @@ -772,7 +802,11 @@ Requires: termcap Requires: glibc >= 2.6 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} +%if %{su110} +Requires: glibc >= 2.8 +Requires: termcap +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{fc5} && ! %{fc6} && ! %{fc7} && ! %{fc8} && ! %{fc9} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -907,6 +941,23 @@ Requires: fontconfig >= 2.4 Requires: gnome-vfs2 >= 2.20 Requires: libpng %endif +%if %{gconsole} && %{su110} +Requires: gtk2 >= 2.12 +Requires: libgnome >= 2.22 +Requires: libgnomeui >= 2.22 +Requires: glibc >= 2.8 +Requires: ORBit2 +Requires: libart_lgpl >= 2.3 +Requires: libbonobo >= 2.22 +Requires: libbonoboui >= 2.22 +Requires: bonobo-activation +Requires: gconf2 +Requires: freetype2 +Requires: cairo +Requires: fontconfig >= 2.4 +Requires: gnome-vfs2 >= 2.22 +Requires: libpng +%endif %if %{gconsole} && %{mdk} && !%{mdv} Requires: gtk2 >= 2.0 Requires: libgnomeui2 @@ -1008,7 +1059,7 @@ Requires: libbonoboui >= 2.22 Requires: GConf2 Requires: freetype %endif -%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} +%if %{gconsole} && !%{su9} && !%{su10} && !%{su102} && !%{su103} && !%{su110} && !%{mdk} && !%{fc3} && !%{fc4} && !%{fc5} && !%{fc6} && !%{fc7} && !%{fc8} && !%{fc9} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -1033,7 +1084,10 @@ Requires: xsu %if %{gconsole} && %{su103} Requires: xsu %endif -%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{gconsole} && %{su110} +Requires: xsu +%endif +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} Requires: usermode %endif @@ -1072,6 +1126,10 @@ Requires: gtk2 >= 2.10 Requires: gtk2 >= 2.12 %endif +%if %{wxconsole} && %{su110} +Requires: gtk2 >= 2.12 +%endif + %if %{wxconsole} && %{fc3} Requires: gtk2 >= 2.4 %endif @@ -1158,6 +1216,18 @@ Requires: libstdc++ Requires: zlib %endif +%if %{bat} && %{su110} +Requires: openssl +Requires: glibc >= 2.8 +Requires: fontconfig +Requires: freetype2 +Requires: libgcc +Requires: libpng +Requires: qt >= 4.2 +Requires: libstdc++ +Requires: zlib +%endif + %if %{bat} && %{fc5} Requires: openssl Requires: glibc >= 2.4 @@ -1237,7 +1307,7 @@ the client or server packages. # SuSE turns off stripping of binaries by default. In order to get # stripped packages we must generate debug package. RedHat and Mandriva # turn debug packages on by default but strip binaries regardless. -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} %debug_package %endif @@ -1251,7 +1321,7 @@ the client or server packages. %build -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} export LDFLAGS="${LDFLAGS} -L/usr/lib/termcap" %endif @@ -1302,6 +1372,9 @@ patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch %if %{sqlite} && %{su103} patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch %endif +%if %{sqlite} && %{su110} +patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch +%endif # 64 bit lib location hacks # as of 1.39.18 it should not be necessary to enable x86_64 as configure is @@ -1423,7 +1496,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps %define usermode_iftrick 0 %endif -%if %{usermode_iftrick} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{usermode_iftrick} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} mkdir -p $RPM_BUILD_ROOT/etc/pam.d mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps mkdir -p $RPM_BUILD_ROOT/usr/bin @@ -1502,7 +1575,7 @@ rm -f $RPM_BUILD_ROOT%{script_dir}/gconsole rm -f $RPM_BUILD_ROOT/usr/sbin/static-bacula-fd # install the init scripts -%if %{su9} || %{su10} || %{su102} || %{su103} +%if %{su9} || %{su10} || %{su102} || %{su103} || %{su110} cp -p platforms/suse/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/suse/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/suse/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd @@ -1512,7 +1585,7 @@ cp -p platforms/mandrake/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/mandrake/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/mandrake/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd %endif -%if ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{mdk} +%if ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} && ! %{mdk} cp -p platforms/redhat/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/redhat/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/redhat/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd @@ -1548,6 +1621,12 @@ cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/b cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif +%if %{gconsole} && %{su110} +cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png +cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop +cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm +cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop +%endif %if %{wxconsole} && %{su10} cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop @@ -1560,6 +1639,10 @@ cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxcon cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop %endif +%if %{wxconsole} && %{su110} +cp -p src/wx-console/wxwin16x16.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/wxwin16x16.xpm +cp -p scripts/wxconsole.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/wxconsole.desktop +%endif %if %{bat} && %{su102} 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 @@ -1568,6 +1651,10 @@ 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 %{bat} && %{su110} +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} || %{fc9} || %{mdk} %define iftrick 1 %else @@ -2162,7 +2249,7 @@ echo "The database update scripts were installed to %{script_dir}/updatedb" %{_mandir}/man1/bacula-tray-monitor.1.%{manpage_ext} %endif -%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} # add the console helper files %config(noreplace,missingok) /etc/pam.d/bgnome-console %config(noreplace,missingok) /etc/security/console.apps/bgnome-console @@ -2207,7 +2294,7 @@ fi %{_mandir}/man1/bacula-bwxconsole.1.%{manpage_ext} %endif -%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{wxconsole} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} # add the console helper files %config(noreplace,missingok) /etc/pam.d/bwx-console %config(noreplace,missingok) /etc/security/console.apps/bwx-console @@ -2252,7 +2339,7 @@ fi %{_mandir}/man1/bat.1.%{manpage_ext} %endif -%if %{bat} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} +%if %{bat} && ! %{su9} && ! %{su10} && ! %{su102} && ! %{su103} && ! %{su110} # add the console helper files %config(noreplace,missingok) /etc/pam.d/bat %config(noreplace,missingok) /etc/security/console.apps/bat @@ -2287,6 +2374,8 @@ fi %endif %changelog +* Sat Jun 28 2008 D. Scott Barninger +- add su110 target * Sat May 24 2008 D. Scott Barninger - add fc9 target * Sun Mar 30 2008 D. Scott Barninger