packages: nagios-plugins-rabbitmq/nagios-plugins-rabbitmq.spec - cleanup de...

glen glen at pld-linux.org
Tue Jan 3 12:31:39 CET 2012


Author: glen                         Date: Tue Jan  3 11:31:39 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanup deps, use perl autogenerated deps
- fix shebang for autodep generator
- use perl install method (installs manuals too)
- version seems to be 1.0.4 based on Build.PL info
- utils.pm not used, so cleanup the junk deps

---- Files affected:
packages/nagios-plugins-rabbitmq:
   nagios-plugins-rabbitmq.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/nagios-plugins-rabbitmq/nagios-plugins-rabbitmq.spec
diff -u packages/nagios-plugins-rabbitmq/nagios-plugins-rabbitmq.spec:1.4 packages/nagios-plugins-rabbitmq/nagios-plugins-rabbitmq.spec:1.5
--- packages/nagios-plugins-rabbitmq/nagios-plugins-rabbitmq.spec:1.4	Tue Jan  3 12:02:59 2012
+++ packages/nagios-plugins-rabbitmq/nagios-plugins-rabbitmq.spec	Tue Jan  3 12:31:34 2012
@@ -1,34 +1,26 @@
 # $Revision$, $Date$
+# TODO
+# - plugin config
 %define		plugin	rabbitmq
-# enable here and BR deps, and noautoreq for Perl based plugins
 %include	/usr/lib/rpm/macros.perl
 Summary:	Nagios plugin to rabbitmq
 Summary(pl.UTF-8):	Wtyczka Nagiosa sprawdzająca rabbitmq
 Name:		nagios-plugins-%{plugin}
-Version:	1.0.1
-Release:	0.3
-License:	Apache License v.2.0
+Version:	1.0.4
+Release:	0.4
+License:	Apache License v2.0
 Group:		Networking
-Source0:	https://github.com/jamesc/nagios-plugins-rabbitmq/tarball/master#/nagios-plugins-%{plugin}.tar.gz
+Source0:	https://github.com/jamesc/nagios-plugins-rabbitmq/tarball/master#/%{plugin}-%{version}.tar.gz
 # Source0-md5:	93333929a60df1102d1632f6d602daa1
 URL:		https://github.com/jamesc/nagios-plugins-rabbitmq/
-# enable for Perl based plugins
 BuildRequires:	perl-JSON >= 2.12
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
+BuildRequires:	sed >= 4.0
 Requires:	nagios-common
-Requires:	nagios-plugins-libs
-Requires:	perl(JSON)
-Requires:	perl(LWP::UserAgent)
-Requires:	perl(Nagios::Plugin)
-Requires:	perl(Getopt::Long)
-Requires:	perl(Pod::Usage)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# for perl plugins:
-%define		_noautoreq	perl(utils)
-
 %define		_sysconfdir	/etc/nagios/plugins
 %define		plugindir	%{_prefix}/lib/nagios/plugins
 
@@ -39,20 +31,42 @@
 Wtyczka Nagiosa sprawdzająca rabbitmq.
 
 %prep
-%setup -q -n jamesc-%{name}-48d234e
+%setup -qc
+mv jamesc-%{name}-*/* .
+
+# fix #!%{_bindir}/env perl -w -> #!%{__perl}:
+%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' scripts/*
+
+grep 'dist_version => "%{version}"' Build.PL
+
+%build
+%{__perl} Build.PL \
+	installdirs=vendor \
+	destdir=$RPM_BUILD_ROOT
+./Build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{plugindir}
-cp scripts/* $RPM_BUILD_ROOT%{plugindir}/
+./Build install
 
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{plugindir}}
+mv $RPM_BUILD_ROOT{%{_bindir}/*,%{plugindir}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{plugindir}/*
+%attr(755,root,root) %{plugindir}/check_rabbitmq_aliveness
+%attr(755,root,root) %{plugindir}/check_rabbitmq_objects
+%attr(755,root,root) %{plugindir}/check_rabbitmq_overview
+%attr(755,root,root) %{plugindir}/check_rabbitmq_queue
+%attr(755,root,root) %{plugindir}/check_rabbitmq_server
+%{_mandir}/man1/check_rabbitmq_aliveness.1p*
+%{_mandir}/man1/check_rabbitmq_objects.1p*
+%{_mandir}/man1/check_rabbitmq_overview.1p*
+%{_mandir}/man1/check_rabbitmq_queue.1p*
+%{_mandir}/man1/check_rabbitmq_server.1p*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -60,6 +74,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2012/01/03 11:31:34  glen
+- cleanup deps, use perl autogenerated deps
+- fix shebang for autodep generator
+- use perl install method (installs manuals too)
+- version seems to be 1.0.4 based on Build.PL info
+- utils.pm not used, so cleanup the junk deps
+
 Revision 1.4  2012/01/03 11:02:59  cieciwa
 - updated.
 
@@ -69,4 +90,3 @@
 
 Revision 1.2  2012/01/03 09:55:32  cieciwa
 - adapterized.
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugins-rabbitmq/nagios-plugins-rabbitmq.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list