SPECS: nagios-plugin-check_mysql_perf.spec - use nagios-plugins-devel; rel 2

[glen]

Author: glen                         Date: Mon Feb 16 13:29:13 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use nagios-plugins-devel; rel 2

---- Files affected:
SPECS:
   nagios-plugin-check_mysql_perf.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/nagios-plugin-check_mysql_perf.spec
diff -u SPECS/nagios-plugin-check_mysql_perf.spec:1.3 SPECS/nagios-plugin-check_mysql_perf.spec:1.4
--- SPECS/nagios-plugin-check_mysql_perf.spec:1.3	Sun Feb 15 16:55:59 2009
+++ SPECS/nagios-plugin-check_mysql_perf.spec	Mon Feb 16 14:29:08 2009
@@ -1,21 +1,18 @@
 # $Revision$, $Date$
-# TODO
-# - use nagios-plugins-devel or sth
 %define		plugin	check_mysql_perf
 Summary:	Nagios plugin: monitor various performance-related characteristics of a MySQL db
 Name:		nagios-plugin-%{plugin}
 Version:	1.3.2.3
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Networking
 Source0:	http://www.consol.com/fileadmin/opensource/Nagios/%{plugin}-%{version}.tar.gz
 # Source0-md5:	7f6476a15ecb48e2aaacf103d829f104
-Source1:	http://dl.sourceforge.net/nagiosplug/nagios-plugins-1.4.13.tar.gz
-# Source1-md5:	be6cc7699fff3ee29d1fd4d562377386
+Patch0:		nagios-plugin-check_mysql_perf-np.patch
 URL:		http://www.consol.com/opensource/nagios/check-mysql-perf
 BuildRequires:	mysql-devel
+BuildRequires:	nagios-plugins-devel
 Requires:	nagios-core
-Conflicts:	nagios-common < 2.9-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/nagios/plugins
@@ -26,8 +23,8 @@
 characteristics of a MySQL database.
 
 %prep
-%setup -q -n %{plugin}-%{version} -a1
-mv nagios-plugins-* nagios-plugins
+%setup -q -n %{plugin}-%{version}
+%patch0 -p1
 
 # see plugin --help (-m option) for list of these
 cat > nagios.cfg <<'EOF'
@@ -98,11 +95,6 @@
 EOF
 
 %build
-cd nagios-plugins
-%configure \
-	--disable-perl-modules
-%{__make}
-cd ..
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -110,7 +102,7 @@
 %configure \
 	--with-nagios-user=nagios \
 	--with-nagios-group=nagios \
-	--with-officialplugins=$(pwd)/nagios-plugins
+	--with-officialplugins=%{_prefix}
 %{__make}
 
 %install
@@ -133,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2009/02/16 13:29:08  glen
+- use nagios-plugins-devel; rel 2
+
 Revision 1.3  2009/02/15 15:55:59  glen
 - cosmetics, cleanups, unify
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nagios-plugin-check_mysql_perf.spec?r1=1.3&r2=1.4&f=u