Author: glen Date: Sun Apr 3 11:42:59 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- cleanups
---- Files affected:
packages/nagios-plugin-check_rbl:
nagios-plugin-check_rbl.spec (1.17 -> 1.18)
---- Diffs:
================================================================
Index: packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec
diff -u packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec:1.17
packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec:1.18
--- packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec:1.17 Sun Apr
3 13:38:46 2011
+++ packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec Sun Apr
3 13:42:54 2011
@@ -20,17 +20,14 @@
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: sed >= 4.0
%if %{with tests}
-BuildRequires: perl-Nagios-Plugin
+BuildRequires: perl-Nagios-Plugin >= 0.31
BuildRequires: perl-Net-DNS
-BuildRequires: perl-Parallel-Iterator
BuildRequires: perl-Readonly
%endif
Requires: nagios-common
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreq 'perl(utils)'
-
%define _sysconfdir /etc/nagios/plugins
%define plugindir %{_prefix}/lib/nagios/plugins
@@ -40,11 +37,6 @@
%prep
%setup -q -n %{plugin}-%{version}
-# https://trac.id.ethz.ch/projects/nagios_plugins/ticket/68
-%{__sed} -i -e '
-s/use version;\s*//
-' %{plugin}
-
%build
%{__perl} Makefile.PL \
INSTALLVENDORSCRIPT=%{plugindir} \
@@ -59,12 +51,12 @@
DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.ini
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.ini
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/check_rbl/.packlist
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/check_rbl.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/check_rbl/.packlist
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorlib}/check_rbl.pod
%clean
rm -rf $RPM_BUILD_ROOT
@@ -83,6 +75,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2011/04/03 11:42:54 glen
+- cleanups
+
Revision 1.17 2011/04/03 11:38:46 glen
- GPL version
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec?r1=1.17&r2=1.18&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
