packages: nagios-plugin-check_multi/nagios-plugin-check_multi.spec - keep s...

[glen]

Author: glen                         Date: Wed Jun 27 19:48:59 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- keep sample_config as dirname

---- Files affected:
packages/nagios-plugin-check_multi:
   nagios-plugin-check_multi.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec
diff -u packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.6 packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.7
--- packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.6	Mon Jun 25 22:58:04 2012
+++ packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec	Wed Jun 27 21:48:54 2012
@@ -8,7 +8,7 @@
 Summary:	Multi purpose wrapper plugin for Nagios/Icinga
 Name:		nagios-plugin-%{plugin}
 Version:	0.26
-Release:	0.19
+Release:	0.22
 License:	GPL v2
 Group:		Networking
 URL:		http://my-plugin.de/wiki/projects/check_multi/start
@@ -17,6 +17,7 @@
 Source1:	%{plugin}.cfg
 Patch0:		issue-6.patch
 Patch1:		nstats.patch
+Patch2:		nagios2-mode.patch
 BuildRequires:	perl-base
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	sed >= 4.0
@@ -48,6 +49,7 @@
 %setup -q -n %{plugin}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i -e '
 	s, at sysconfdir@/send_nsca.cfg,/etc/nagios/send_nsca.cfg,
@@ -81,7 +83,7 @@
 
 # package contrib and sample config as examples
 %{__make} install-config \
-	CFGDIR=%{_examplesdir}/%{name}-%{version}/config \
+	CFGDIR=%{_examplesdir}/%{name}-%{version}/sample_config \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} install-contrib \
@@ -92,7 +94,7 @@
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
 
-cd $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/config
+cd $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/sample_config
 # this one seems useful, package as config
 cp -p nagiostats.cmd $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}
 
@@ -112,18 +114,18 @@
 
 %{_examplesdir}/%{name}-%{version}/contrib
 
-%dir %{_examplesdir}/%{name}-%{version}/config
-%{_examplesdir}/%{name}-%{version}/config/*.cmd
+%dir %{_examplesdir}/%{name}-%{version}/sample_config
+%{_examplesdir}/%{name}-%{version}/sample_config/*.cmd
 
-%dir %{_examplesdir}/%{name}-%{version}/config/cluster
-%{_examplesdir}/%{name}-%{version}/config/cluster/*.cfg
-%{_examplesdir}/%{name}-%{version}/config/cluster/*.cmd
-
-%dir %{_examplesdir}/%{name}-%{version}/config/feed_passive
-%{_examplesdir}/%{name}-%{version}/config/feed_passive/*.cfg
-%{_examplesdir}/%{name}-%{version}/config/feed_passive/*.cmd
-%{_examplesdir}/%{name}-%{version}/config/feed_passive/*.tpl
-%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/config/feed_passive/gencfg
+%dir %{_examplesdir}/%{name}-%{version}/sample_config/cluster
+%{_examplesdir}/%{name}-%{version}/sample_config/cluster/*.cfg
+%{_examplesdir}/%{name}-%{version}/sample_config/cluster/*.cmd
+
+%dir %{_examplesdir}/%{name}-%{version}/sample_config/feed_passive
+%{_examplesdir}/%{name}-%{version}/sample_config/feed_passive/*.cfg
+%{_examplesdir}/%{name}-%{version}/sample_config/feed_passive/*.cmd
+%{_examplesdir}/%{name}-%{version}/sample_config/feed_passive/*.tpl
+%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/sample_config/feed_passive/gencfg
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -131,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2012/06/27 19:48:54  glen
+- keep sample_config as dirname
+
 Revision 1.6  2012/06/25 20:58:04  glen
 - package nagiostats.cmd, let NSTATS default value be set by configure time
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec?r1=1.6&r2=1.7