From eff763cdc0e767dfc7ac40de520c598e3b642bf1 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Wed, 20 Feb 2013 09:55:41 +0100
Subject: [PATCH] Update to 5.2.13

---
 .gitignore                                    |  1 +
 bacula-5.2.12-update-postgresql-table.patch   | 13 ------------
 ...ild.patch => bacula-5.2.13-bat-build.patch | 18 ++++++++---------
 bacula.spec                                   | 20 ++++++++++---------
 sources                                       |  2 +-
 5 files changed, 22 insertions(+), 32 deletions(-)
 delete mode 100644 bacula-5.2.12-update-postgresql-table.patch
 rename bacula-5.2.11-bat-build.patch => bacula-5.2.13-bat-build.patch (51%)

diff --git a/.gitignore b/.gitignore
index f4cee29..0546f4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ bacula-docs-5.0.3.tar.bz2
 /bacula-5.2.10.tar.gz
 /bacula-5.2.11.tar.gz
 /bacula-5.2.12.tar.gz
+/bacula-5.2.13.tar.gz
diff --git a/bacula-5.2.12-update-postgresql-table.patch b/bacula-5.2.12-update-postgresql-table.patch
deleted file mode 100644
index 4e9c5d5..0000000
--- a/bacula-5.2.12-update-postgresql-table.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/updatedb/update_postgresql_tables_10_to_11.in b/updatedb/update_postgresql_tables_10_to_11.in
-index f5df19f..1be8033 100644
---- a/updatedb/update_postgresql_tables_10_to_11.in
-+++ b/updatedb/update_postgresql_tables_10_to_11.in
-@@ -10,7 +10,7 @@ bindir=@POSTGRESQL_BINDIR@
- PATH="$bindir:$PATH"
- db_name=${db_name:-@db_name@}
- 
--psql -f - -d ${db_name} $* <<END-OF-DATA
-+if psql -f - -d ${db_name} $* <<END-OF-DATA
- -- The alter table operation can be faster with a big maintenance_work_mem
- -- Uncomment and adapt this value to your environment
- -- SET maintenance_work_mem = '1GB';
diff --git a/bacula-5.2.11-bat-build.patch b/bacula-5.2.13-bat-build.patch
similarity index 51%
rename from bacula-5.2.11-bat-build.patch
rename to bacula-5.2.13-bat-build.patch
index 24196c5..6b86cd4 100644
--- a/bacula-5.2.11-bat-build.patch
+++ b/bacula-5.2.13-bat-build.patch
@@ -1,6 +1,6 @@
-diff -Naur bacula-5.2.11.old/src/qt-console/bat.pro.in bacula-5.2.11/src/qt-console/bat.pro.in
---- bacula-5.2.11.old/src/qt-console/bat.pro.in	2012-09-12 14:02:40.954271883 +0200
-+++ bacula-5.2.11/src/qt-console/bat.pro.in	2012-09-12 14:03:21.913062191 +0200
+diff -Naur bacula-5.2.13.old/src/qt-console/bat.pro.in bacula-5.2.13/src/qt-console/bat.pro.in
+--- bacula-5.2.13.old/src/qt-console/bat.pro.in	2013-02-19 20:21:35.000000000 +0100
++++ bacula-5.2.13/src/qt-console/bat.pro.in	2013-02-20 09:45:44.110033340 +0100
 @@ -6,13 +6,13 @@
  #
  #   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -17,17 +17,17 @@ diff -Naur bacula-5.2.11.old/src/qt-console/bat.pro.in bacula-5.2.11/src/qt-cons
  help.files = help/*.html images/status.png images/mail-message-new.png
  
  TEMPLATE     = app
-diff -Naur bacula-5.2.11.old/src/qt-console/main.cpp bacula-5.2.11/src/qt-console/main.cpp
---- bacula-5.2.11.old/src/qt-console/main.cpp	2012-09-12 14:02:40.940271612 +0200
-+++ bacula-5.2.11/src/qt-console/main.cpp	2012-09-12 14:03:04.496726144 +0200
+diff -Naur bacula-5.2.13.old/src/qt-console/main.cpp bacula-5.2.13/src/qt-console/main.cpp
+--- bacula-5.2.13.old/src/qt-console/main.cpp	2013-02-19 20:21:35.000000000 +0100
++++ bacula-5.2.13/src/qt-console/main.cpp	2013-02-20 09:46:19.556679571 +0100
 @@ -40,9 +40,9 @@
  /*
-  * We need Qt version 4.7.4 or later to be able to comple correctly
+  * We need Qt version 4.8.4 or later to be able to comple correctly
   */
--#if QT_VERSION < 0x040704
+-#if QT_VERSION < 0x040804
 +#if QT_VERSION < 0x040602
  #error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
--#error "You need Qt version 4.7.4 or later to build Bat"
+-#error "You need Qt version 4.8.4 or later to build Bat"
 +#error "You need Qt version 4.6.2 or later to build Bat"
  #error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
  #endif
diff --git a/bacula.spec b/bacula.spec
index 950904a..d5afa0a 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,8 +2,8 @@
 %global username bacula
 
 Name:                   bacula
-Version:                5.2.12
-Release:                9%{?dist}
+Version:                5.2.13
+Release:                1%{?dist}
 Summary:                Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:                AGPLv3 with exceptions
@@ -31,9 +31,8 @@ Source19:               bacula-checkconf
 Patch1:                 bacula-5.0.2-openssl.patch
 Patch2:                 bacula-5.2.2-queryfile.patch
 Patch3:                 bacula-5.0.3-sqlite-priv.patch
-Patch4:                 bacula-5.2.11-bat-build.patch
+Patch4:                 bacula-5.2.13-bat-build.patch
 Patch5:                 bacula-5.2.12-seg-fault.patch
-Patch6:                 bacula-5.2.12-update-postgresql-table.patch
 
 BuildRequires:          desktop-file-utils
 BuildRequires:          perl
@@ -142,7 +141,7 @@ Obsoletes:              bacula-director-sqlite < 5.2.3-5
 Provides:               bacula-director-postgresql = %{version}-%{release}
 Obsoletes:              bacula-director-postgresql < 5.2.3-5
 
-%if 0%{?fedora} == 16 || 0%{?fedora} == 17
+%if 0%{?fedora} == 17
 Requires(post):         systemd-units
 Requires(preun):        systemd-units
 Requires(postun):       systemd-units
@@ -184,7 +183,7 @@ Obsoletes:              bacula-storage-sqlite < 5.2.0
 Provides:               bacula-storage-postgresql = %{version}-%{release}
 Obsoletes:              bacula-storage-postgresql < 5.2.0
 
-%if 0%{?fedora} == 16 || 0%{?fedora} == 17
+%if 0%{?fedora} == 17
 Requires(post):         systemd-units
 Requires(preun):        systemd-units
 Requires(postun):       systemd-units
@@ -219,7 +218,7 @@ Summary:                Bacula backup client
 Group:                  System Environment/Daemons
 Requires:               bacula-common%{?_isa} = %{version}-%{release}
 
-%if 0%{?fedora} == 16 || 0%{?fedora} == 17
+%if 0%{?fedora} == 17
 Requires(post):         systemd-units
 Requires(preun):        systemd-units
 Requires(postun):       systemd-units
@@ -318,7 +317,6 @@ Provides check_bacula support for Nagios.
 %patch3 -p0 -b .priv
 %patch4 -p1 -b .bat-build
 %patch5 -p1 -b .seg-fault
-%patch6 -p1 -b .update-postgresql-table
 
 # Remove execution permissions from files we're packaging as docs later on
 find updatedb -type f | xargs chmod -x
@@ -529,7 +527,7 @@ getent passwd %username >/dev/null || useradd -u %uid -r -s /sbin/nologin \
 exit 0
 
 
-%if 0%{?fedora} == 16 || 0%{?fedora} == 17
+%if 0%{?fedora} == 17
 
 %post client
 if [ $1 -eq 1 ] ; then
@@ -908,6 +906,10 @@ fi
 
 
 %changelog
+* Wed Feb 20 2013 Simone Caronni <negativo17@gmail.com> - 5.2.13-1
+- Update to 5.2.13, drop upstreamed patch.
+- Remove Fedora 16 (EOL) checks.
+
 * Sun Feb 10 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 5.2.12-9
 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
 
diff --git a/sources b/sources
index a7ea3ea..3b815d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b04c22b128b73359e4bbc9de06652c38  bacula-5.2.12.tar.gz
+43417bae0c221afb1f30a581c9e0f2fe  bacula-5.2.13.tar.gz