From cfe7622a59576b6c03b43bb3e28e02e32b353b9a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 1 Jun 2013 10:55:20 +0300 Subject: [PATCH] rpm5 autodep generator defines --- nagios-plugin.spec | 3 ++- perl.spec | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nagios-plugin.spec b/nagios-plugin.spec index 8a2e128..f162a91 100644 --- a/nagios-plugin.spec +++ b/nagios-plugin.spec @@ -16,6 +16,7 @@ URL: - # enable for Perl based plugins #BuildRequires: perl-devel >= 1:5.8.0 #BuildRequires: rpm-perlprov >= 4.1-13 +#BuildRequires: rpmbuild(macros) >= 1.654 Requires: nagios-common # Requires: nagios-plugins-libs for utils.{sh,pm,php}, for Perl set noautoreq for perl(utils) #Requires: nagios-plugins-libs @@ -23,7 +24,7 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # for perl plugins: -%define _noautoreq perl(utils) +%define _noautoreq_perl utils %define _sysconfdir /etc/nagios/plugins %define plugindir %{_prefix}/lib/nagios/plugins diff --git a/perl.spec b/perl.spec index 044b630..8afa261 100644 --- a/perl.spec +++ b/perl.spec @@ -28,6 +28,8 @@ Source0: http://www.cpan.org/modules/by-module/PDIR/%{pdir}-%{pnam}-%{version}.t Patch0: %{name}-foo.patch # most of CPAN modules have generic URL (substitute pdir and pnam here) URL: http://search.cpan.org/dist/PDIR-PNAM/ +# macros BR if _noautoreq_perl is used +#BuildRequires: rpmbuild(macros) >= 1.654 BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: - @@ -41,7 +43,7 @@ Obsoletes: - BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreq 'perl(anything_fake_or_conditional)' +%define _noautoreq_perl anything_fake_or_conditional %description -- 2.44.0