packages: bacula/bacula.spec - try to build nagios plugin, formatting

glen glen at pld-linux.org
Fri Apr 30 13:41:43 CEST 2010 

Author: glen                         Date: Fri Apr 30 11:41:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- try to build nagios plugin, formatting

---- Files affected:
packages/bacula:
   bacula.spec (1.135 -> 1.136) 

---- Diffs:

================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.135 packages/bacula/bacula.spec:1.136
--- packages/bacula/bacula.spec:1.135	Wed Apr 21 21:38:47 2010
+++ packages/bacula/bacula.spec	Fri Apr 30 13:41:37 2010
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 # TODO:
-#	- update desktop files, think about su-wrappers for console
+#	- update desktop files, think about su-wrappers for console (with .desktop files)
 #	- package web admin
 #	- fix log file permissions
 #
@@ -12,6 +12,7 @@
 %bcond_without	pgsql			# use PostgreSQL
 %bcond_without	sqlite3			# use SQLite3
 %bcond_without	python
+%bcond_with	nagios		# build nagios plugin
 %bcond_with	rescue
 %bcond_with	sqlite3_sync_off	# makes SQLite3 backend much faster, but less reliable
 #
@@ -27,11 +28,11 @@
 Epoch:		0
 License:	extended GPL v2
 Group:		Networking/Utilities
-Source0:	http://dl.sourceforge.net/bacula/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
 # Source0-md5:	beb9f8da196b3c9ffb0356f087dbdb99
-Source1:	http://dl.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
+Source1:	http://downloads.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
 # Source1-md5:	ce2ef0dca50ab916fd6701b53b7bb4df
-Source2:	http://dl.sourceforge.net/bacula/%{name}-rescue-5.0.0.tar.gz
+Source2:	http://downloads.sourceforge.net/bacula/%{name}-rescue-5.0.0.tar.gz
 # Source2-md5:	349623581cfe0bcd798dd137abac959a
 Source10:	%{name}-dir.init
 Source11:	%{name}-fd.init
@@ -90,6 +91,7 @@
 
 %define		_sysconfdir	/etc/%{name}
 %define		_localstatedir	/var/lib/%{name}
+%define		nagiosplugindir	%{_prefix}/lib/nagios/plugins
 
 # from 'the worst' to 'the best'
 %define	databases %{?with_dbi:dbi} %{?with_sqlite3:sqlite3} %{?with_mysql:mysql} %{?with_pgsql:postgresql}
@@ -441,6 +443,14 @@
 Ten pakiet zawiera skrypty do odtwarzania po awarii i tworzy dyskietkę
 ratunkowe do odtwarzania systemu od zera.
 
+%package -n nagios-plugin-check_bacula
+Summary:	Nagios plugin to check bacula
+Group:		Networking
+Requires:	nagios-common
+
+%description -n nagios-plugin-check_bacula
+Nagios plugin to check bacula.
+
 %prep
 %setup -q -a 1
 %patch0 -p1
@@ -479,7 +489,7 @@
 
 # we wan't the 'base' build built with the last database in the list,
 # to make sure it is full-featured
-for database in %{databases} ; do
+for database in %{databases}; do
 	WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
 	%configure \
 		--with-scriptdir=%{_libexecdir}/%{name} \
@@ -525,6 +535,11 @@
 
 %{__make}
 
+%if %{with nagios}
+# nagios plugin
+%{__make} -C examples/nagios/check_bacula
+%endif
+
 %if %{with rescue}
 cd rescue
 %configure \
@@ -545,7 +560,7 @@
 
 # install libraries for all the database backends
 # ldconfig will add the soname symlinks when one of the packages is installed
-for database in %{databases} ; do
+for database in %{databases}; do
 	for libfile in libbacsql/$database%{_libdir}/lib*-*.so; do
 		orig_name=${libfile##*/}
 		file_prefix=${orig_name%%-*.so}
@@ -568,7 +583,7 @@
 # tray-monitor is for regular users
 #mv $RPM_BUILD_ROOT%{_sbindir}/bacula-tray-monitor $RPM_BUILD_ROOT%{_bindir}
 
-install scripts/bacula.png $RPM_BUILD_ROOT%{_pixmapsdir}/bacula.png
+cp -a scripts/bacula.png $RPM_BUILD_ROOT%{_pixmapsdir}/bacula.png
 #install src/tray-monitor/generic.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/bacula-tray-monitor.xpm
 sed -e 's/gnome-console/wx-console/g;s/Console/Wx Console/g' \
 	scripts/bacula.desktop.gnome2 > $RPM_BUILD_ROOT%{_desktopdir}/bacula-wx.desktop
@@ -577,22 +592,23 @@
 %endif
 
 %if %{with bat}
+# TODO: libtool install
 install src/qt-console/.libs/bat $RPM_BUILD_ROOT%{_bindir}
-install scripts/bat.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -a scripts/bat.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 
 %if %{with rescue}
 # install the rescue stuff, these are the rescue scripts
-install rescue/linux/floppy/backup.etc.list $RPM_BUILD_ROOT%{_sysconfdir}/rescue
-install rescue/linux/floppy/*_* $RPM_BUILD_ROOT%{_sysconfdir}/rescue
-install rescue/linux/floppy/getdiskinfo $RPM_BUILD_ROOT%{_sysconfdir}/rescue
-install rescue/linux/floppy/sfdisk.bz2 $RPM_BUILD_ROOT%{_sysconfdir}/rescue
+cp -a rescue/linux/floppy/backup.etc.list $RPM_BUILD_ROOT%{_sysconfdir}/rescue
+cp -a rescue/linux/floppy/sfdisk.bz2 $RPM_BUILD_ROOT%{_sysconfdir}/rescue
+install -p rescue/linux/floppy/*_* $RPM_BUILD_ROOT%{_sysconfdir}/rescue
+install -p rescue/linux/floppy/getdiskinfo $RPM_BUILD_ROOT%{_sysconfdir}/rescue
 %endif
 
 touch $RPM_BUILD_ROOT/var/log/bacula/log
 
 # install the updatedb scripts
-install updatedb/update_sqlite* $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+install -p updatedb/update_sqlite* $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
 # place for site passwords
 touch $RPM_BUILD_ROOT%{_sysconfdir}/{dir-password,fd-password,sd-password}
@@ -636,6 +652,11 @@
 	ln -sf /dev/null $RPM_BUILD_ROOT%{_libexecdir}/%{name}/$f
 done
 
+%if %{with nagios}
+%{__make} -C examples/nagios/check_bacula install \
+	sbindir=%{nagiosplugindir} \
+	DESTDIR=$RPM_BUILD_ROOT
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -756,18 +777,18 @@
 
 %define db_post() \
 /sbin/ldconfig \
-for name in "create database" "drop tables" "drop database" "grant privileges" "make tables" "update tables" ; do \
+for name in "create database" "drop tables" "drop database" "grant privileges" "make tables" "update tables"; do \
 	prefix="${name%% *}" \
 	suffix="${name#* }" \
-	ln -sf "${prefix}_%{1}_${suffix}" %{_libexecdir}/%{name}/"${prefix}_bacula_${suffix}" || :  \
+	ln -sf "${prefix}_%{1}_${suffix}" %{_libexecdir}/%{name}/"${prefix}_bacula_${suffix}" || : \
 done \
 %service bacula-dir restart "Bacula Director daemon"
 
 %define db_postun() \
 /sbin/ldconfig \
 if [ "$1" = "0" ]; then \
-	for f in %{_libexecdir}/%{name}/*_bacula_* ; do \
-		if [ -L "$f" -a ! -e "$f" ] ; then \
+	for f in %{_libexecdir}/%{name}/*_bacula_*; do \
+		if [ -L "$f" -a ! -e "$f" ]; then \
 			rm "$f" \
 		fi \
 	done \
@@ -920,7 +941,6 @@
 
 %ghost %attr(755,root,root) %{_libdir}/libbacsql-%{version}.so
 
-
 %files fd
 %defattr(644,root,root,755)
 %doc LICENSE
@@ -979,7 +999,7 @@
 %{_pixmapsdir}/%{name}.png
 %{_desktopdir}/bat.desktop
 # Do not make this file world-readable or any user will get full access to the
-# backup system 
+# backup system
 %attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bat.conf
 %attr(755,root,root) %{_bindir}/bat
 %{_mandir}/man1/bat.1*
@@ -1014,19 +1034,28 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rescue/sfdisk.bz2
 %endif
 
+%if %{with nagios}
+%files -n nagios-plugin-check_bacula
+%defattr(644,root,root,755)
+%attr(755,root,root) %{nagiosplugindir}/check_bacula
+%endif
+
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.136  2010/04/30 11:41:37  glen
+- try to build nagios plugin, formatting
+
 Revision 1.135  2010/04/21 19:38:47  jajcus
 - patch to build with openssl-1.0.0
 - Release: 3
 
 Revision 1.134  2010/03/18 09:48:54  jajcus
 - the bat.conf-fixing trigger moved to the common-package. Insecure files may
-be in place even after old bat has been uninstalled
+  be in place even after old bat has been uninstalled
 
 Revision 1.133  2010/03/18 09:47:23  jajcus
 - trigger to fix insecure permissions on bat.conf on upgrade
@@ -1035,10 +1064,10 @@
 
 Revision 1.132  2010/03/18 09:14:29  jajcus
 - SECURITY: limit access to bat.conf to user root and bacula group only. This file
-contains a password which gives full access to the backup server (this could be
-used to destroy all backups and even all data on the client machines). Tray
-monitor is not affected, as it used different credentials with lower
-privileges.
+  contains a password which gives full access to the backup server (this could be
+  used to destroy all backups and even all data on the client machines). Tray
+  monitor is not affected, as it used different credentials with lower
+  privileges.
 - move bat executable to %{_bindir}, as it can be used by users too
 
 Revision 1.131  2010/03/17 16:09:24  glen
@@ -1209,7 +1238,7 @@
 - rel 3; fix log path; add /var/log/bacula; fix dir post
 
 Revision 1.80  2007-11-24 21:25:16  arekm
-bacula-dir.conf needs to be root:bacula for reload console command to work
+- bacula-dir.conf needs to be root:bacula for reload console command to work
 
 Revision 1.79  2007-11-24 21:06:47  arekm
 - force PLD branding
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.135&r2=1.136&f=u

More information about the pld-cvs-commit mailing list