From 1e67f513ab46e40d60e20c048d4447ef01681086 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Jan 15 2021 14:05:13 +0000
Subject: Build CDP plugin components


---

diff --git a/bacula.spec b/bacula.spec
index 3676e73..6a6c316 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:               bacula
 Version:            11.0.0
-Release:            1%{?dist}
+Release:            2%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
@@ -40,7 +40,9 @@ Patch11:            %{name}-docker-plugin.patch
 # Without this, there is no library providing the correct shared object name
 # required by the daemons.
 # http://bugs.bacula.org/view.php?id=2084
-Patch13:            %{name}-autoconf.patch
+Patch12:            %{name}-autoconf.patch
+Patch13:            %{name}-build-cdp-plugin.patch
+Patch14:            %{name}-nagios.patch
 
 BuildRequires:      desktop-file-utils
 BuildRequires:      perl-generators
@@ -341,6 +343,7 @@ 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_build
+%make_build -C src/tools/cdp-client
 %make_build -C examples/nagios/check_bacula
 
 pushd src/qt-console/tray-monitor
@@ -351,9 +354,8 @@ popd
 # Convert image to png for tray monitor icon
 %install
 %make_install
-
-# Nagios plugin
-install -p -m 755 -D examples/nagios/check_bacula/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
+%make_install -C src/tools/cdp-client
+%make_install -C examples/nagios/check_bacula
 
 # This will be managed through alternatives, as it requires the name to NOT
 # change between upgrades, so the versioned library name can not be used.
@@ -584,9 +586,11 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
 %{_mandir}/man8/bacula-fd.8*
 %{_libdir}/%{name}/bpipe-fd.so
+%{_libdir}/%{name}/cdp-fd.so
 %{_libdir}/%{name}/docker-fd.so
 %{_sbindir}/bacula-fd
 %{_sbindir}/bfdjson
+%{_sbindir}/cdp-client
 %{_unitdir}/bacula-fd.service
 
 %files console
@@ -623,6 +627,9 @@ exit 0
 %{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Fri Jan 15 2021 Simone Caronni <negativo17@gmail.com> - 11.0.0-2
+- Build CDP plugin components.
+
 * Tue Jan 12 2021 Simone Caronni <negativo17@gmail.com> - 11.0.0-1
 - Update to 11.0.0.
 - Enable Docker plugin.