From 33ede89feff28aeba42d915a51091b9f9d8fe0f2 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 27 Jan 2007 09:47:13 +0000 Subject: [PATCH] Final changes git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.0@4052 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/ChangeLog | 26 +++++++ bacula/ReleaseNotes | 7 ++ bacula/platforms/mandrake/bacula.spec.in | 94 ++++++++++++++++++------ bacula/platforms/redhat/bacula.spec.in | 94 ++++++++++++++++++------ bacula/platforms/suse/bacula.spec.in | 94 ++++++++++++++++++------ bacula/technotes-2.0 | 3 + 6 files changed, 255 insertions(+), 63 deletions(-) diff --git a/bacula/ChangeLog b/bacula/ChangeLog index 04e8e885f4..81144ffa9c 100644 --- a/bacula/ChangeLog +++ b/bacula/ChangeLog @@ -1,6 +1,32 @@ Technical notes on version 2.0 General: + +Version 2.0.2 released: xx January 2007 +27Jan07 +kes Get current main CVS .specs for RedHat, SuSE, Mandrake. +26Jan07 +ebl Implement the include JobID in spool file name project. +kes Reorder projects file in order determined by Jan 2007 vote. +kes Fix open of SQLite3 db where user does not have write permission + so that DIR does not crash. Fixes bug #761. +25Jan07 +kes Change 'Device not configured to autolabel' from INFO + to WARNING. +kes Fix jobq.c to restart failed jobs when Reschedule Times = 0 + which should restart an indefinite # of times. +kes Fix configure --help to print --with-mysql[=DIR]. Same for + other DIR specifications. +23Jan07 +rn Fix msvc build problems. Fix bacula.dll exports for msvc build. + Fix path quoting in SQLite scripts. + Fix problems with SHGetFolderPath. +19Jan07 +kes Create patches/2.0.1-restart.patch. Fixes bug #755. +18Jan07 +kes Fix Job restart on error bug that promotes an Inc to a Full + backup. This should fix bug #755. + Version 2.0.1 12Jan07 kes Fix Bacula->Documentation link on Win32 to point to index.html diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index 2d6ba3734a..c34349e25c 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -5,6 +5,13 @@ This is a bug fix release to version 2.0.1: +27Jan07 +kes Get current main CVS .specs for RedHat, SuSE, Mandrake. +26Jan07 +ebl Implement the include JobID in spool file name project. +kes Reorder projects file in order determined by Jan 2007 vote. +kes Fix open of SQLite3 db where user does not have write permission + so that DIR does not crash. Fixes bug #761. 25Jan07 kes Change 'Device not configured to autolabel' from INFO to WARNING. diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index 8027924522..e9e67572f7 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V. +# Copyright (C) 2000-2006 Kern Sibbald # Platform Build Configuration @@ -90,6 +90,8 @@ Packager: %{_packager} %{?build_fc4:%define fc4 1} %define fc5 0 %{?build_fc5:%define fc5 1} +%define fc6 0 +%{?build_fc6:%define fc6 1} # Whitebox Enterprise build %define wb3 0 %{?build_wb3:%define wb3 1} @@ -124,7 +126,7 @@ Packager: %{_packager} %{?build_client_only:%define client_only 1} # test for a platform definition -%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} +%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -172,7 +174,7 @@ exit 1 %if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} %define _dist %(grep Red /etc/redhat-release) %endif -%if %{fc1} || %{fc4} || %{fc5} +%if %{fc1} || %{fc4} || %{fc5} || %{fc6} %define _dist %(grep Fedora /etc/redhat-release) %endif %if %{centos4} || %{centos3} @@ -233,11 +235,11 @@ Distribution: %{_dist} %define wxconsole 0 %endif -%{expand: %%define gccver %(rpm -q gcc | cut -d - -f 2)} -%{expand: %%define gccrel %(rpm -q gcc | cut -d - -f 3)} +%{expand: %%define gccver %(rpm -q --queryformat %%{version} gcc)} +%{expand: %%define gccrel %(rpm -q --queryformat %%{release} gcc)} BuildRequires: gcc, gcc-c++, make, autoconf -BuildRequires: atk-devel, ncurses-devel, perl +BuildRequires: ncurses-devel, perl BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, libxml2-devel, zlib-devel BuildRequires: openssl-devel %if %{python} @@ -245,7 +247,7 @@ BuildRequires: python, python-devel %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} %endif %if %{gconsole} -BuildRequires: pkgconfig, pango-devel +BuildRequires: pkgconfig, pango-devel, atk-devel %endif %if %{rh7} BuildRequires: libtermcap-devel @@ -360,11 +362,25 @@ BuildRequires: libbonoboui-devel >= 2.14 BuildRequires: GConf2-devel BuildRequires: freetype-devel %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} +%if %{fc6} +BuildRequires: libtermcap-devel +BuildRequires: glibc-devel >= 2.5 +%endif +%if %{fc6} && %{gconsole} +BuildRequires: gtk2-devel >= 2.10 +BuildRequires: libgnomeui-devel >= 2.16 +BuildRequires: ORBit2-devel +BuildRequires: libart_lgpl-devel >= 2.3 +BuildRequires: libbonobo-devel >= 2.16 +BuildRequires: libbonoboui-devel >= 2.16 +BuildRequires: GConf2-devel +BuildRequires: freetype-devel +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && %{gconsole} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: ORBit2-devel @@ -442,7 +458,7 @@ Requires: libtermcap Requires: glibc >= 2.3 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} && ! %{fc6} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -450,6 +466,10 @@ Requires: libtermcap Requires: glibc >= 2.4 Requires: libtermcap %endif +%if %{fc6} +Requires: glibc >= 2.5 +Requires: libtermcap +%endif %if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4} && ! %{mysql5} Requires: mysql >= 3.23 @@ -570,7 +590,7 @@ Requires: libtermcap Requires: glibc >= 2.3 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} && ! %{fc6} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -578,6 +598,10 @@ Requires: libtermcap Requires: glibc >= 2.4 Requires: libtermcap %endif +%if %{fc6} +Requires: glibc >= 2.5 +Requires: libtermcap +%endif %if %{python} Requires: python >= %{pyver} @@ -716,7 +740,18 @@ Requires: libbonoboui >= 2.14 Requires: GConf2 Requires: freetype %endif -%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} +%if %{gconsole} && %{fc6} +Requires: gtk2 >= 2.10 +Requires: libgnomeui >= 2.16 +Requires: glibc >= 2.5 +Requires: ORBit2 +Requires: libart_lgpl >= 2.3 +Requires: libbonobo >= 2.16 +Requires: libbonoboui >= 2.16 +Requires: GConf2 +Requires: freetype +%endif +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -778,6 +813,10 @@ Requires: gtk2 >= 2.6 Requires: gtk2 >= 2.8 %endif +%if %{wxconsole} && %{fc6} +Requires: gtk2 >= 2.10 +%endif + %if %{wxconsole} %description wxconsole %{blurb} @@ -861,9 +900,9 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}" --with-scriptdir=/etc/bacula \ --enable-smartalloc \ --enable-client-only \ - %if %{mdk} - --disable-nls \ - %endif + %if %{mdk} + --disable-nls \ + %endif --enable-static-fd make @@ -890,15 +929,15 @@ make --with-postgresql \ %endif %if %{wxconsole} - --enable-wx-console \ + --enable-wx-console \ %endif %if %{python} - --with-python \ + --with-python \ %endif %if %{client_only} - --enable-client-only \ + --enable-client-only \ %endif - --mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-working-dir=%{working_dir} \ --with-pid-dir=/var/run \ --with-subsys-dir=/var/lock/subsys \ @@ -956,7 +995,7 @@ make \ sysconfdir=$RPM_BUILD_ROOT/etc/bacula \ scriptdir=$RPM_BUILD_ROOT/etc/bacula \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ install %if ! %{client_only} @@ -1140,6 +1179,10 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_DIR/%{name}-docs-%{docs_version} +rm -rf $RPM_BUILD_DIR/%{name}-rescue-%{_rescuever} +rm -rf $RPM_BUILD_DIR/depkgs +rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt %if %{mysql} # MySQL specific files @@ -1217,7 +1260,7 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/logfiles/bacula.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/services/bacula.conf -%attr(-, root, %{daemon_group}) /etc/bacula/query.sql +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/query.sql %attr(-, %{storage_daemon_user}, %{daemon_group}) %dir %{working_dir} @@ -1686,6 +1729,15 @@ fi %endif %changelog +* Sat Jan 20 2007 D. Scott Barninger +- correct bug 752 +- set query.sql as config file +- correct bug 754 +* Sun Jan 14 2007 D. Scott Barninger +- 2.0.1 release +- change determination of gcc version per patch from Marc Hennes +- move BuildRequire for atk-devel to gnome only builds +- add fc6 build tag * Sat Jan 06 2007 D. Scott Barninger - 2.0.0 release * Sun Oct 15 2006 D. Scott Barninger diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index 8027924522..e9e67572f7 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V. +# Copyright (C) 2000-2006 Kern Sibbald # Platform Build Configuration @@ -90,6 +90,8 @@ Packager: %{_packager} %{?build_fc4:%define fc4 1} %define fc5 0 %{?build_fc5:%define fc5 1} +%define fc6 0 +%{?build_fc6:%define fc6 1} # Whitebox Enterprise build %define wb3 0 %{?build_wb3:%define wb3 1} @@ -124,7 +126,7 @@ Packager: %{_packager} %{?build_client_only:%define client_only 1} # test for a platform definition -%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} +%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -172,7 +174,7 @@ exit 1 %if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} %define _dist %(grep Red /etc/redhat-release) %endif -%if %{fc1} || %{fc4} || %{fc5} +%if %{fc1} || %{fc4} || %{fc5} || %{fc6} %define _dist %(grep Fedora /etc/redhat-release) %endif %if %{centos4} || %{centos3} @@ -233,11 +235,11 @@ Distribution: %{_dist} %define wxconsole 0 %endif -%{expand: %%define gccver %(rpm -q gcc | cut -d - -f 2)} -%{expand: %%define gccrel %(rpm -q gcc | cut -d - -f 3)} +%{expand: %%define gccver %(rpm -q --queryformat %%{version} gcc)} +%{expand: %%define gccrel %(rpm -q --queryformat %%{release} gcc)} BuildRequires: gcc, gcc-c++, make, autoconf -BuildRequires: atk-devel, ncurses-devel, perl +BuildRequires: ncurses-devel, perl BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, libxml2-devel, zlib-devel BuildRequires: openssl-devel %if %{python} @@ -245,7 +247,7 @@ BuildRequires: python, python-devel %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} %endif %if %{gconsole} -BuildRequires: pkgconfig, pango-devel +BuildRequires: pkgconfig, pango-devel, atk-devel %endif %if %{rh7} BuildRequires: libtermcap-devel @@ -360,11 +362,25 @@ BuildRequires: libbonoboui-devel >= 2.14 BuildRequires: GConf2-devel BuildRequires: freetype-devel %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} +%if %{fc6} +BuildRequires: libtermcap-devel +BuildRequires: glibc-devel >= 2.5 +%endif +%if %{fc6} && %{gconsole} +BuildRequires: gtk2-devel >= 2.10 +BuildRequires: libgnomeui-devel >= 2.16 +BuildRequires: ORBit2-devel +BuildRequires: libart_lgpl-devel >= 2.3 +BuildRequires: libbonobo-devel >= 2.16 +BuildRequires: libbonoboui-devel >= 2.16 +BuildRequires: GConf2-devel +BuildRequires: freetype-devel +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && %{gconsole} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: ORBit2-devel @@ -442,7 +458,7 @@ Requires: libtermcap Requires: glibc >= 2.3 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} && ! %{fc6} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -450,6 +466,10 @@ Requires: libtermcap Requires: glibc >= 2.4 Requires: libtermcap %endif +%if %{fc6} +Requires: glibc >= 2.5 +Requires: libtermcap +%endif %if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4} && ! %{mysql5} Requires: mysql >= 3.23 @@ -570,7 +590,7 @@ Requires: libtermcap Requires: glibc >= 2.3 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} && ! %{fc6} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -578,6 +598,10 @@ Requires: libtermcap Requires: glibc >= 2.4 Requires: libtermcap %endif +%if %{fc6} +Requires: glibc >= 2.5 +Requires: libtermcap +%endif %if %{python} Requires: python >= %{pyver} @@ -716,7 +740,18 @@ Requires: libbonoboui >= 2.14 Requires: GConf2 Requires: freetype %endif -%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} +%if %{gconsole} && %{fc6} +Requires: gtk2 >= 2.10 +Requires: libgnomeui >= 2.16 +Requires: glibc >= 2.5 +Requires: ORBit2 +Requires: libart_lgpl >= 2.3 +Requires: libbonobo >= 2.16 +Requires: libbonoboui >= 2.16 +Requires: GConf2 +Requires: freetype +%endif +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -778,6 +813,10 @@ Requires: gtk2 >= 2.6 Requires: gtk2 >= 2.8 %endif +%if %{wxconsole} && %{fc6} +Requires: gtk2 >= 2.10 +%endif + %if %{wxconsole} %description wxconsole %{blurb} @@ -861,9 +900,9 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}" --with-scriptdir=/etc/bacula \ --enable-smartalloc \ --enable-client-only \ - %if %{mdk} - --disable-nls \ - %endif + %if %{mdk} + --disable-nls \ + %endif --enable-static-fd make @@ -890,15 +929,15 @@ make --with-postgresql \ %endif %if %{wxconsole} - --enable-wx-console \ + --enable-wx-console \ %endif %if %{python} - --with-python \ + --with-python \ %endif %if %{client_only} - --enable-client-only \ + --enable-client-only \ %endif - --mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-working-dir=%{working_dir} \ --with-pid-dir=/var/run \ --with-subsys-dir=/var/lock/subsys \ @@ -956,7 +995,7 @@ make \ sysconfdir=$RPM_BUILD_ROOT/etc/bacula \ scriptdir=$RPM_BUILD_ROOT/etc/bacula \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ install %if ! %{client_only} @@ -1140,6 +1179,10 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_DIR/%{name}-docs-%{docs_version} +rm -rf $RPM_BUILD_DIR/%{name}-rescue-%{_rescuever} +rm -rf $RPM_BUILD_DIR/depkgs +rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt %if %{mysql} # MySQL specific files @@ -1217,7 +1260,7 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/logfiles/bacula.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/services/bacula.conf -%attr(-, root, %{daemon_group}) /etc/bacula/query.sql +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/query.sql %attr(-, %{storage_daemon_user}, %{daemon_group}) %dir %{working_dir} @@ -1686,6 +1729,15 @@ fi %endif %changelog +* Sat Jan 20 2007 D. Scott Barninger +- correct bug 752 +- set query.sql as config file +- correct bug 754 +* Sun Jan 14 2007 D. Scott Barninger +- 2.0.1 release +- change determination of gcc version per patch from Marc Hennes +- move BuildRequire for atk-devel to gnome only builds +- add fc6 build tag * Sat Jan 06 2007 D. Scott Barninger - 2.0.0 release * Sun Oct 15 2006 D. Scott Barninger diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index 8027924522..e9e67572f7 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2007 Free Software Foundation Europe, e.V. +# Copyright (C) 2000-2006 Kern Sibbald # Platform Build Configuration @@ -90,6 +90,8 @@ Packager: %{_packager} %{?build_fc4:%define fc4 1} %define fc5 0 %{?build_fc5:%define fc5 1} +%define fc6 0 +%{?build_fc6:%define fc6 1} # Whitebox Enterprise build %define wb3 0 %{?build_wb3:%define wb3 1} @@ -124,7 +126,7 @@ Packager: %{_packager} %{?build_client_only:%define client_only 1} # test for a platform definition -%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} +%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -172,7 +174,7 @@ exit 1 %if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} %define _dist %(grep Red /etc/redhat-release) %endif -%if %{fc1} || %{fc4} || %{fc5} +%if %{fc1} || %{fc4} || %{fc5} || %{fc6} %define _dist %(grep Fedora /etc/redhat-release) %endif %if %{centos4} || %{centos3} @@ -233,11 +235,11 @@ Distribution: %{_dist} %define wxconsole 0 %endif -%{expand: %%define gccver %(rpm -q gcc | cut -d - -f 2)} -%{expand: %%define gccrel %(rpm -q gcc | cut -d - -f 3)} +%{expand: %%define gccver %(rpm -q --queryformat %%{version} gcc)} +%{expand: %%define gccrel %(rpm -q --queryformat %%{release} gcc)} BuildRequires: gcc, gcc-c++, make, autoconf -BuildRequires: atk-devel, ncurses-devel, perl +BuildRequires: ncurses-devel, perl BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, libxml2-devel, zlib-devel BuildRequires: openssl-devel %if %{python} @@ -245,7 +247,7 @@ BuildRequires: python, python-devel %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} %endif %if %{gconsole} -BuildRequires: pkgconfig, pango-devel +BuildRequires: pkgconfig, pango-devel, atk-devel %endif %if %{rh7} BuildRequires: libtermcap-devel @@ -360,11 +362,25 @@ BuildRequires: libbonoboui-devel >= 2.14 BuildRequires: GConf2-devel BuildRequires: freetype-devel %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} +%if %{fc6} +BuildRequires: libtermcap-devel +BuildRequires: glibc-devel >= 2.5 +%endif +%if %{fc6} && %{gconsole} +BuildRequires: gtk2-devel >= 2.10 +BuildRequires: libgnomeui-devel >= 2.16 +BuildRequires: ORBit2-devel +BuildRequires: libart_lgpl-devel >= 2.3 +BuildRequires: libbonobo-devel >= 2.16 +BuildRequires: libbonoboui-devel >= 2.16 +BuildRequires: GConf2-devel +BuildRequires: freetype-devel +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} BuildRequires: libtermcap-devel BuildRequires: glibc-devel >= 2.3 %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && %{gconsole} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} && %{gconsole} BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: ORBit2-devel @@ -442,7 +458,7 @@ Requires: libtermcap Requires: glibc >= 2.3 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} && ! %{fc6} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -450,6 +466,10 @@ Requires: libtermcap Requires: glibc >= 2.4 Requires: libtermcap %endif +%if %{fc6} +Requires: glibc >= 2.5 +Requires: libtermcap +%endif %if %{mysql} && ! %{su9} && ! %{mdk} && ! %{mysql4} && ! %{mysql5} Requires: mysql >= 3.23 @@ -570,7 +590,7 @@ Requires: libtermcap Requires: glibc >= 2.3 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{fc5} && ! %{fc6} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -578,6 +598,10 @@ Requires: libtermcap Requires: glibc >= 2.4 Requires: libtermcap %endif +%if %{fc6} +Requires: glibc >= 2.5 +Requires: libtermcap +%endif %if %{python} Requires: python >= %{pyver} @@ -716,7 +740,18 @@ Requires: libbonoboui >= 2.14 Requires: GConf2 Requires: freetype %endif -%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} +%if %{gconsole} && %{fc6} +Requires: gtk2 >= 2.10 +Requires: libgnomeui >= 2.16 +Requires: glibc >= 2.5 +Requires: ORBit2 +Requires: libart_lgpl >= 2.3 +Requires: libbonobo >= 2.16 +Requires: libbonoboui >= 2.16 +Requires: GConf2 +Requires: freetype +%endif +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} && ! %{fc5} && ! %{fc6} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -778,6 +813,10 @@ Requires: gtk2 >= 2.6 Requires: gtk2 >= 2.8 %endif +%if %{wxconsole} && %{fc6} +Requires: gtk2 >= 2.10 +%endif + %if %{wxconsole} %description wxconsole %{blurb} @@ -861,9 +900,9 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}" --with-scriptdir=/etc/bacula \ --enable-smartalloc \ --enable-client-only \ - %if %{mdk} - --disable-nls \ - %endif + %if %{mdk} + --disable-nls \ + %endif --enable-static-fd make @@ -890,15 +929,15 @@ make --with-postgresql \ %endif %if %{wxconsole} - --enable-wx-console \ + --enable-wx-console \ %endif %if %{python} - --with-python \ + --with-python \ %endif %if %{client_only} - --enable-client-only \ + --enable-client-only \ %endif - --mandir=%{_mandir} \ + --mandir=%{_mandir} \ --with-working-dir=%{working_dir} \ --with-pid-dir=/var/run \ --with-subsys-dir=/var/lock/subsys \ @@ -956,7 +995,7 @@ make \ sysconfdir=$RPM_BUILD_ROOT/etc/bacula \ scriptdir=$RPM_BUILD_ROOT/etc/bacula \ working_dir=$RPM_BUILD_ROOT%{working_dir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ install %if ! %{client_only} @@ -1140,6 +1179,10 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_DIR/%{name}-docs-%{docs_version} +rm -rf $RPM_BUILD_DIR/%{name}-rescue-%{_rescuever} +rm -rf $RPM_BUILD_DIR/depkgs +rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt %if %{mysql} # MySQL specific files @@ -1217,7 +1260,7 @@ rm -rf $RPM_BUILD_ROOT/etc/bacula/updatedb %attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/logfiles/bacula.conf %attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/services/bacula.conf -%attr(-, root, %{daemon_group}) /etc/bacula/query.sql +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/query.sql %attr(-, %{storage_daemon_user}, %{daemon_group}) %dir %{working_dir} @@ -1686,6 +1729,15 @@ fi %endif %changelog +* Sat Jan 20 2007 D. Scott Barninger +- correct bug 752 +- set query.sql as config file +- correct bug 754 +* Sun Jan 14 2007 D. Scott Barninger +- 2.0.1 release +- change determination of gcc version per patch from Marc Hennes +- move BuildRequire for atk-devel to gnome only builds +- add fc6 build tag * Sat Jan 06 2007 D. Scott Barninger - 2.0.0 release * Sun Oct 15 2006 D. Scott Barninger diff --git a/bacula/technotes-2.0 b/bacula/technotes-2.0 index e5e289cd83..b4785523d5 100644 --- a/bacula/technotes-2.0 +++ b/bacula/technotes-2.0 @@ -1,6 +1,9 @@ Technical notes on version 2.0 General: +Version 2.0.2 released: xx January 2007 +27Jan07 +kes Get current main CVS .specs for RedHat, SuSE, Mandrake. 26Jan07 ebl Implement the include JobID in spool file name project. kes Reorder projects file in order determined by Jan 2007 vote. -- 2.39.5