[bacula/f19: 1/2] Require nagios-common, update patches

[Simone Caronni]

commit c9e483afb546927ff3a7a48eea207420bac00f05
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Apr 1 17:39:27 2014 +0200

    Require nagios-common, update patches

 bacula-5.2.13-queryfile.patch |   39 ++++++++++++++++
 bacula-5.2.2-queryfile.patch  |   12 -----
 bacula-help-update.patch      |  102 -----------------------------------------
 bacula.spec                   |   22 ++++----
 4 files changed, 50 insertions(+), 125 deletions(-)
---
diff --git a/bacula-5.2.13-queryfile.patch b/bacula-5.2.13-queryfile.patch
new file mode 100644
index 0000000..52407db
--- /dev/null
+++ b/bacula-5.2.13-queryfile.patch
@@ -0,0 +1,39 @@
+diff -Naur bacula-5.2.13.old/src/dird/bacula-dir.conf.in bacula-5.2.13/src/dird/bacula-dir.conf.in
+--- bacula-5.2.13.old/src/dird/bacula-dir.conf.in	2013-02-19 20:21:35.000000000 +0100
++++ bacula-5.2.13/src/dird/bacula-dir.conf.in	2014-04-01 17:32:06.108349877 +0200
+@@ -15,7 +15,7 @@
+ Director {                            # define myself
+   Name = @basename at -dir
+   DIRport = @dir_port@                # where we listen for UA connections
+-  QueryFile = "@scriptdir@/query.sql"
++  QueryFile = "@sysconfdir@/query.sql"
+   WorkingDirectory = "@working_dir@"
+   PidDirectory = "@piddir@"
+   Maximum Concurrent Jobs = 1
+diff -Naur bacula-5.2.13.old/src/dird/Makefile.in bacula-5.2.13/src/dird/Makefile.in
+--- bacula-5.2.13.old/src/dird/Makefile.in	2013-02-19 20:21:35.000000000 +0100
++++ bacula-5.2.13/src/dird/Makefile.in	2014-04-01 17:32:06.108349877 +0200
+@@ -116,11 +116,11 @@
+ 	   @if test "x${dir_group}" != "x"; then \
+ 	      chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
+ 	   fi
+-	@if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
++	@if  test -f ${DESTDIR}${sysconfdir}/query.sql; then \
+ 	   echo "  ==> Saving existing query.sql to query.sql.old"; \
+-	   $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
++	   $(MV) -f ${DESTDIR}${sysconfdir}/query.sql ${DESTDIR}${sysconfdir}/query.sql.old; \
+ 	fi 
+-	${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql
++	${INSTALL_DATA} query.sql ${DESTDIR}${sysconfdir}/query.sql
+ 	@if test -f static-bacula-dir; then \
+ 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-dir $(DESTDIR)$(sbindir)/static-bacula-dir; \
+ 	fi
+@@ -129,7 +129,7 @@
+ uninstall:
+ 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir)
+ 	(cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new)
+-	(cd $(DESTDIR)$(scriptdir); $(RMF) query.sql)
++	(cd $(DESTDIR)$(sysconfdir); $(RMF) query.sql)
+ 
+ 
+ 
diff --git a/bacula.spec b/bacula.spec
index 3468cfe..664bec4 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:               bacula
 Version:            5.2.13
-Release:            17%{?dist}
+Release:            18%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
@@ -32,12 +32,12 @@ Source17:           %{name}-sd.sysconfig
 Source18:           %{name}-sd.sysconfig.el5
 
 Patch1:             %{name}-5.0.2-openssl.patch
-Patch2:             %{name}-5.2.2-queryfile.patch
+Patch2:             %{name}-5.2.13-queryfile.patch
 Patch3:             %{name}-5.0.3-sqlite-priv.patch
 Patch4:             %{name}-5.2.13-bat-build.patch
 Patch5:             %{name}-5.2.12-seg-fault.patch
 Patch6:             %{name}-5.2.13-logwatch.patch
-Patch7:             %{name}-help-update.patch
+Patch7:             %{name}-5.2.13-help-update.patch
 Patch8:             %{name}-aarch64.patch
 Patch9:             %{name}-non-free-code.patch
 
@@ -290,6 +290,7 @@ This development package contains static libraries and header files.
 Summary:            Nagios Plugin - check_bacula
 Group:              Applications/System
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
+Requires:           nagios-common%{?_isa}
 
 %description -n nagios-plugins-bacula
 Provides check_bacula support for Nagios.
@@ -363,14 +364,11 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
-
-pushd examples/nagios/check_bacula
-        CFLAGS="%{optflags}" make LIBS="-lpthread -ldl -lssl -lcrypto -lz"
-popd
+make -C examples/nagios/check_bacula
 
 %if 0%{?fedora} || 0%{?rhel} >= 6
 pushd src/qt-console/tray-monitor
-        /usr/bin/qmake-qt4
+        $QMAKE
         make %{?_smp_mflags}
 popd
 %endif
@@ -390,9 +388,6 @@ install -p -m 644 -D manpages/bpluginfo.8 %{buildroot}%{_mandir}/man8/bpluginfo.
 rm -f %{buildroot}%{_libdir}/libbaccats.so
 rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
 
-# Sample query file
-mv %{buildroot}%{_libexecdir}/bacula/query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql
-
 %if 0%{?fedora} || 0%{?rhel} >= 6
 # Bat
 install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat.png
@@ -764,6 +759,11 @@ fi
 %{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Tue Apr 01 2014 Simone Caronni <negativo17 at gmail.com> - 5.2.13-18
+- Add missing requirement for Nagios plugin folder.
+- Update queryfile patch.
+- Update man pages patch.
+
 * Tue Aug 06 2013 Simone Caronni <negativo17 at gmail.com> - 5.2.13-17
 - Fix dependencies for devel subpackage.
 - Explicitly declare dependency also on libs-sql subpackage where required, so