[bacula/f18] Revert "Merge branch 'master' into f18"

[Simone Caronni]

commit bf6746f2f4f1b0ecd739e544c254c9ad625bfb18
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Feb 15 12:58:19 2013 +0100

    Revert "Merge branch 'master' into f18"
    
    This reverts commit 1597210a45c415df960a587ecd0b32c34f0d04a5, reversing
    changes made to 4eb05c1a6379f8c9cca9ba6a7824b67f13b68eca.

 bacula-5.2.12-update-postgresql-table.patch |   13 +++++++++++++
 bacula.spec                                 |   18 +++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/bacula-5.2.12-update-postgresql-table.patch b/bacula-5.2.12-update-postgresql-table.patch
new file mode 100644
index 0000000..4e9c5d5
--- /dev/null
+++ b/bacula-5.2.12-update-postgresql-table.patch
@@ -0,0 +1,13 @@
+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:- at 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.spec b/bacula.spec
index f1762c7..950904a 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:                   bacula
 Version:                5.2.12
-Release:                7%{?dist}
+Release:                9%{?dist}
 Summary:                Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:                AGPLv3 with exceptions
@@ -33,6 +33,7 @@ Patch2:                 bacula-5.2.2-queryfile.patch
 Patch3:                 bacula-5.0.3-sqlite-priv.patch
 Patch4:                 bacula-5.2.11-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
@@ -317,6 +318,7 @@ 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
@@ -405,13 +407,13 @@ mv %{buildroot}%{_libexecdir}/bacula/query.sql %{buildroot}%{_sysconfdir}/bacula
 %if 0%{?fedora} || 0%{?rhel} >= 6
 # Bat
 install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat.png
-desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
 
 # QT Tray monitor
 install -p -m 755 -D src/qt-console/tray-monitor/.libs/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor
 install -p -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf
 install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
-desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
 
 %else
 rm -f %{buildroot}%{_mandir}/man1/bat.1*
@@ -870,14 +872,14 @@ fi
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
 %{_sbindir}/bat
 %{_mandir}/man1/bat.1.*
-%{_datadir}/applications/fedora-bacula-bat.desktop
+%{_datadir}/applications/bacula-bat.desktop
 %{_datadir}/pixmaps/bat.png
 
 %files traymonitor
 %defattr(-,root,root,-)
 %{_sbindir}/bacula-tray-monitor
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
-%{_datadir}/applications/fedora-bacula-traymonitor.desktop
+%{_datadir}/applications/bacula-traymonitor.desktop
 %{_datadir}/pixmaps/bacula-tray-monitor.png
 %endif
 
@@ -906,6 +908,12 @@ fi
 
 
 %changelog
+* Sun Feb 10 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 5.2.12-9
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+
+* Fri Feb 08 2013 Petr Hracek <phracek at redhat.com> - 5.2.12-8
+- Fix: (#881146) syntax error in update_postgresql_tables_10_to_11.in
+
 * Mon Feb 04 2013 Petr Hracek <phracek at redhat.com> - 5.2.12-7
 - Fix (#905309) e_msg: Process /usr/sbin/bat was killed by signal 11 (SIGSEGV)