5.0.3 rpm release. Postgres defines for version and package names. Drop sqlite support.

diff --git a/bacula/platforms/contrib-rpm/build_rpm.sh b/bacula/platforms/contrib-rpm/build_rpm.sh
index 67d82dc7daeb81c8acd08c00ec573f4d7f6754ba..86ffadfa8c20a2e18b57e0bd9084ba3e3ce8647c 100755 (executable)
--- a/bacula/platforms/contrib-rpm/build_rpm.sh
+++ b/bacula/platforms/contrib-rpm/build_rpm.sh
@@ -21,7 +21,7 @@
 ###########################################################################################
 # script configuration section
 
-VERSION=5.0.2
+VERSION=5.0.3
 RELEASE=1
 
 # build platform for spec
@@ -106,14 +106,6 @@ rpmbuild --rebuild --define "build_${PLATFORM} 1" \
 --define "build_python 1" ${SRPM}
 rm -rf ${RPMBUILD}/*
 
-echo Building SQLite packages for "$PLATFORM"...
-sleep 2
-rpmbuild --rebuild --define "build_${PLATFORM} 1" \
---define "build_sqlite 1" \
---define "contrib_packager ${PACKAGER}" \
---define "build_python 1" ${SRPM}
-rm -rf ${RPMBUILD}/*
-
 if [ "$BUILDBAT" = "1" ]; then
        echo Building Bat package for "$PLATFORM"...
        sleep 2
@@ -149,9 +141,6 @@ mv -f ${RPMDIR}/bacula-mysql-${VERSION}-${RELEASE}.${ARCH}.rpm \
 mv -f ${RPMDIR}/bacula-postgresql-${VERSION}-${RELEASE}.${ARCH}.rpm \
 ./bacula-postgresql-${VERSION}-${RELEASE}.${FILENAME}.${ARCH}.rpm
 
-mv -f ${RPMDIR}/bacula-sqlite-${VERSION}-${RELEASE}.${ARCH}.rpm \
-./bacula-sqlite-${VERSION}-${RELEASE}.${FILENAME}.${ARCH}.rpm
-
 if [ "$BUILDMTX" = "1" ]; then
        mv -f ${RPMDIR}/bacula-mtx-${VERSION}-${RELEASE}.${ARCH}.rpm \
        ./bacula-mtx-${VERSION}-${RELEASE}.${FILENAME}.${ARCH}.rpm
@@ -200,3 +189,4 @@ ls
 # 05 Apr 2009 deprecate gconsole and wxconsole, bat built by default
 # 30 Jan 2010 adjust for mtx, bat and docs in separate srpm
 # 02 May 2010 add bacula-libs package
+# 06 Sep 2010 remove sqlite build

diff --git a/bacula/platforms/rpm/bacula.spec b/bacula/platforms/rpm/bacula.spec
index bbfb06674367958425ff4d4b78cbfb65c0a1a5fe..f3a9488b2f2426f5e6f49b0766e624672bca94b5 100644 (file)
--- a/bacula/platforms/rpm/bacula.spec
+++ b/bacula/platforms/rpm/bacula.spec
@@ -10,11 +10,17 @@
 %define _packager D. Scott Barninger <barninger@fairfieldcomputers.com>
 %define depkgs_version 18Dec09
 
-%define postgres_version 7
+# postgresql defines - defaults for most platforms
+# pass changes if required
+# versions less than 8 are no longer supported
+%define postgres_version 8
+%{?postgresql_version:%define postgres_version %{postgresql_version}}
 %define postgres_package postgresql
+%{?postgresql_package:%define postgres_package %{postgresql_package}}
 %define postgres_server_package postgresql-server
+%{?postgresql_server_package:%define postgres_server_package %{postgresql_server_package}}
 %define postgres_devel_package postgresql-devel
-
+%{?postgresql_devel_package:%define postgres_devel_package %{postgresql_devel_package}}
 
 %define single_dir 0
 %{?single_dir_install:%define single_dir 1}
@@ -470,10 +476,6 @@ BuildRequires: sysconfig
 %define tcpwrappers 0
 %{?build_tcpwrappers:%define tcpwrappers 1}
 
-# do we need to patch for old postgresql version?
-%define old_pgsql 0
-%{?build_old_pgsql:%define old_pgsql 1}
-
 # Mandriva somehow forces the manpage file extension to bz2 rather than gz
 %if %{mdk}
 %define manpage_ext bz2
@@ -713,6 +715,7 @@ This package installs the shared libraries used by many bacula programs.
 %prep
 %setup
 %setup -T -D -b 1
+%setup -T -D -b 2
 
 %build
 
@@ -1460,6 +1463,13 @@ echo "The database update scripts were installed to %{script_dir}/updatedb"
 %endif
 
 %changelog
+* Mon Sep 06 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
+* Mon Sep 06 2010 Kern Sibbald <kern@sibbald.com>
+- 5.0.3
+- change license to AGPL v3
+- add defines for postgresql version and packages, require version 8 or greater
+- adjusted package description
+- fix bug with libbacsql files
 * Sun Mar 07 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - remove --without-qwt from configure statement
 * Sat Feb 27 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>