From 45a372fcdca10ef6b4774420479245443a82de8c Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 16 Oct 2011 21:26:54 +0200 Subject: [PATCH] Update Specs and ReleaseNotes --- bacula/ReleaseNotes | 6 ++++++ bacula/platforms/rpms/bacula-bat.spec | 10 +++++----- bacula/platforms/rpms/bacula-docs.spec | 6 +++--- bacula/platforms/rpms/bacula-mtx.spec | 6 +++--- bacula/platforms/rpms/bacula.spec | 26 +++++++++++++++++--------- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index 77387eb889..f68cc981f0 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -26,6 +26,12 @@ Compatibility: but it is different from older Bacula versions that could inappropriately prune jobs. Pruning of volumes is not affected. +Building Bat: +------------- +To build Bat, you need Qt4 version 4.6.2. If you build with any other +version it is likely not to work. If you do not have version 4.6.2, on +your system, you can dlownload the Bacula depkgs_qt version 16Dec10. + New Catalog format in version 5.2.0 ----------------------------------- This release of Bacula uses a new catalog format. We provide a set of diff --git a/bacula/platforms/rpms/bacula-bat.spec b/bacula/platforms/rpms/bacula-bat.spec index 5d97ea3a42..b0e75f3ee4 100644 --- a/bacula/platforms/rpms/bacula-bat.spec +++ b/bacula/platforms/rpms/bacula-bat.spec @@ -1,18 +1,18 @@ # Bacula RPM spec file # -# Copyright (C) 2000-2010 Free Software Foundation Europe e.V. +# Copyright (C) 2000-2011 Free Software Foundation Europe e.V. # Platform Build Configuration # basic defines for every build %define _release 1 -%define _version 5.0.1 -%define depkgs_qt_version 28Jul09 +%define _version 5.2.0 +%define depkgs_qt_version 16Dec10 # this is the QT version in depkgs_qt -%define qt4ver 4.3.4 +%define qt4ver 4.6.2 -%define _packager D. Scott Barninger +%define _packager Kern Sibbald %define manpage_ext gz diff --git a/bacula/platforms/rpms/bacula-docs.spec b/bacula/platforms/rpms/bacula-docs.spec index bc9d2cae0c..e4a0dfa1fb 100644 --- a/bacula/platforms/rpms/bacula-docs.spec +++ b/bacula/platforms/rpms/bacula-docs.spec @@ -1,13 +1,13 @@ # Bacula RPM spec file # -# Copyright (C) 2000-2010 Free Software Foundation Europe e.V. +# Copyright (C) 2000-2011 Free Software Foundation Europe e.V. # Platform Build Configuration # basic defines for every build %define _release 1 -%define _version 5.0.0 -%define _packager D. Scott Barninger +%define _version 5.2.0 +%define _packager Kern Sibbald %define _prefix /usr %define _sbindir %_prefix/sbin diff --git a/bacula/platforms/rpms/bacula-mtx.spec b/bacula/platforms/rpms/bacula-mtx.spec index fa5ec20d01..b34ce6eae2 100644 --- a/bacula/platforms/rpms/bacula-mtx.spec +++ b/bacula/platforms/rpms/bacula-mtx.spec @@ -1,13 +1,13 @@ # Bacula RPM spec file # -# Copyright (C) 2000-2009 Free Software Foundation Europe e.V. +# Copyright (C) 2000-2011 Free Software Foundation Europe e.V. # Platform Build Configuration # basic defines for every build %define _release 1 -%define _version 5.0.0 -%define depkgs_version 18Feb09 +%define _version 5.2.0 +%define depkgs_version 15May10 %define _packager D. Scott Barninger %define manpage_ext gz diff --git a/bacula/platforms/rpms/bacula.spec b/bacula/platforms/rpms/bacula.spec index c58218f2cc..15904ff2ee 100644 --- a/bacula/platforms/rpms/bacula.spec +++ b/bacula/platforms/rpms/bacula.spec @@ -6,9 +6,9 @@ # basic defines for every build %define _release 1 -%define _version 5.0.3 -%define _packager D. Scott Barninger -%define depkgs_version 18Dec09 +%define _version 5.2.0 +%define _packager Kern Sibbald +%define depkgs_version 15May10 # postgresql defines - defaults for most platforms # pass changes if required @@ -331,6 +331,8 @@ Source2: http://www.prdownloads.sourceforge.net/bacula/depkgs-%{depkgs_version}. %define rhel5 0 %{?build_rhel5:%define rhel5 1} %{?build_rhel5:%define fc6 1} +%define rhel6 0 +%{?build_rhel6:%define rhel6 1} # CentOS build %define centos3 0 %{?build_centos3:%define centos3 1} @@ -341,6 +343,8 @@ Source2: http://www.prdownloads.sourceforge.net/bacula/depkgs-%{depkgs_version}. %define centos5 0 %{?build_centos5:%define centos5 1} %{?build_centos5:%define fc6 1} +%define centos6 0 +%{?build_centos6:%define centos6 1} # SL build %define sl3 0 %{?build_sl3:%define sl3 1} @@ -391,7 +395,7 @@ Source2: http://www.prdownloads.sourceforge.net/bacula/depkgs-%{depkgs_version}. %define suse 1 %endif %define rhel 0 -%if %{rhel3} || %{rhel4} || %{rhel5} || %{centos3} || %{centos4} || %{centos5} +%if %{rhel3} || %{rhel4} || %{rhel5} || %{rhel6} || %{centos3} || %{centos4} || %{centos5} || %{centos6} %define rhel 1 %endif %define scil 0 @@ -591,8 +595,12 @@ Requires: glibc, readline, %{name}-libs Conflicts: bacula Requires: termcap %else +%if %{rhel6} +Requires: compat-libtermcap +%else Requires: libtermcap %endif +%endif %if %{mysql} Requires: mysql @@ -1108,7 +1116,7 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt %if %{mysql} %pre mysql -# test for bacula database older than version 13 +# test for bacula database older than version 14 # note: this ASSUMES no password has been set for bacula database DB_VER=`mysql 2>/dev/null bacula -e 'select * from Version;'|tail -n 1` %endif @@ -1149,7 +1157,7 @@ DB_VER=`echo 'select * from Version;' | psql bacula 2>/dev/null | tail -3 | head %if ! %{client_only} if [ -n "$DB_VER" ] && [ "$DB_VER" -lt "12" ]; then - echo "This bacula upgrade will update a bacula database from version 12 to 13." + echo "This bacula upgrade will update a bacula database from version 12 to 14." echo "You appear to be running database version $DB_VER. You must first update" echo "your database to version 12 and then install this upgrade. The alternative" echo "is to use %{script_dir}/drop_%{db_backend}_tables to delete all your your current" @@ -1264,7 +1272,7 @@ if [ -z "$DB_VER" ]; then %{script_dir}/make_mysql_tables # check to see if we need to upgrade a 3.x database -elif [ "$DB_VER" -lt "13" ]; then +elif [ "$DB_VER" -lt "14" ]; then echo "This release requires an upgrade to your bacula database." echo "Backing up your current database..." mysqldump -f --opt bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 @@ -1281,7 +1289,7 @@ fi if [ -s %{working_dir}/bacula.db ]; then DB_VER=`echo "select * from Version;" | %{sqlite_bindir}/sqlite3 2>/dev/null %{working_dir}/bacula.db | tail -n 1` # check to see if we need to upgrade a 3.x database - if [ "$DB_VER" -lt "13" ] && [ "$DB_VER" -ge "12" ]; then + if [ "$DB_VER" -lt "14" ] && [ "$DB_VER" -ge "12" ]; then echo "This release requires an upgrade to your bacula database." echo "Backing up your current database..." echo ".dump" | %{sqlite_bindir}/sqlite3 %{working_dir}/bacula.db | bzip2 > %{working_dir}/bacula_backup.sql.bz2 @@ -1319,7 +1327,7 @@ if [ -z "$DB_VER" ]; then %{script_dir}/grant_postgresql_privileges # check to see if we need to upgrade a 5.0.x database -elif [ "$DB_VER" -lt "13" ]; then +elif [ "$DB_VER" -lt "14" ]; then echo "This release requires an upgrade to your bacula database." echo "Backing up your current database..." pg_dump bacula | bzip2 > %{working_dir}/bacula_backup.sql.bz2 -- 2.39.5