commit 2c6750c354b602dfa93c3446920d672e585fe4ac Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Tue Jun 28 14:05:03 2011 +0100 Fix provides filter to work with rpm 4.9 onwards - Fix provides filter to work with rpm 4.9 onwards - Nobody else likes macros for commands perl-Mail-Mbox-MessageParser.spec | 43 ++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 17 deletions(-) --- diff --git a/perl-Mail-Mbox-MessageParser.spec b/perl-Mail-Mbox-MessageParser.spec index 5adba81..5a781f8 100644 --- a/perl-Mail-Mbox-MessageParser.spec +++ b/perl-Mail-Mbox-MessageParser.spec @@ -1,20 +1,20 @@ Summary: A fast and simple mbox folder reader Name: perl-Mail-Mbox-MessageParser Version: 1.5002 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL+ Group: Development/Libraries Url: http://search.cpan.org/dist/Mail-Mbox-MessageParser/ Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-%{version}.tar.gz Source1: perl-module-version-filter Patch0: Mail-Mbox-MessageParser-1.5002-warning.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch -Requires: grep, gzip, bzip2, /usr/bin/diff -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: grep, gzip, bzip2, /usr/bin/diff BuildRequires: perl(ExtUtils::MakeMaker), perl(FileHandle::Unget) BuildRequires: perl(Test::More), perl(Text::Diff) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: grep, gzip, bzip2, /usr/bin/diff %description Mail::Mbox::MessageParser is a feature-poor but very fast mbox parser. It uses @@ -28,31 +28,36 @@ information, GNU grep, or highly optimized Perl. %patch0 -p1 # Auto provides aren't clever enough for what Mail::Mbox::MessageParser does -%global provfilt /bin/sh -c "%{__perl_provides} | %{__perl} -n -s %{SOURCE1} -lib=%{_builddir}/%{buildsubdir}/lib" +%if 0%{?__perllib_provides:1} +%global provfilt /bin/sh -c "%{__perllib_provides} | perl -n -s %{SOURCE1} -lib=%{_builddir}/%{buildsubdir}/lib" +%define __perllib_provides %{provfilt} +%else +%global provfilt /bin/sh -c "%{__perl_provides} | perl -n -s %{SOURCE1} -lib=%{_builddir}/%{buildsubdir}/lib" %define __perl_provides %{provfilt} +%endif %build -%{__perl} Makefile.PL INSTALLDIRS=vendor \ +perl Makefile.PL INSTALLDIRS=vendor \ DIFF=/usr/bin/diff \ - BZIP=%{__bzip2} \ - BZIP2=%{__bzip2} \ - GREP=%{__grep} \ - GZIP=%{__gzip} \ + BZIP=/usr/bin/bzip2 \ + BZIP2=/usr/bin/bzip2 \ + GREP=/bin/grep \ + GZIP=/bin/gzip \ --default -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} -%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} -/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';' -/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null +rm -rf %{buildroot} +make pure_install PERL_INSTALL_ROOT=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null %{_fixperms} %{buildroot} %check -%{__make} test +make test %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %files %defattr(-,root,root,-) @@ -65,6 +70,10 @@ information, GNU grep, or highly optimized Perl. %{_mandir}/man3/Mail::Mbox::MessageParser::Perl.3pm* %changelog +* Tue Jun 28 2011 Paul Howarth <paul@xxxxxxxxxxxx> - 1.5002-9 +- Fix provides filter to work with rpm 4.9 onwards +- Nobody else likes macros for commands + * Sun Jun 19 2011 Marcela Mašláňová <mmaslano@xxxxxxxxxx> - 1.5002-8 - Perl mass rebuild -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel