commit a3bb1c6facc1ae062f38836fd375396f68b2dba2 Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Thu Jul 14 09:18:28 2011 +0100 Modernize provides filter perl-Net-SSLeay.spec | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) --- diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec index af5b8d3..329b7bc 100644 --- a/perl-Net-SSLeay.spec +++ b/perl-Net-SSLeay.spec @@ -21,11 +21,8 @@ BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Warn) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) -# don't "provide" private Perl libs or the redundant unversioned perl(Net::SSLeay) one -%global _use_internal_dependency_generator 0 -%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | sort -u -%global __find_provides /bin/sh -c "grep -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P} | grep -Fvx 'perl(Net::SSLeay)'" -%global __find_requires /bin/sh -c "%{__deploop R}" +# Don't "provide" private Perl libs or the redundant unversioned perl(Net::SSLeay) provide +%global __provides_exclude ^(perl\\(Net::SSLeay\\)$|SSLeay\\.so) %description This module offers some high level convenience functions for accessing @@ -45,6 +42,10 @@ so you can write servers or clients for more complicated applications. chmod -c 644 examples/* perl -pi -e 's|/usr/local/bin/perl|/usr/bin/perl|' examples/*.pl +# Remove redundant unversioned provide if we don't have rpm 4.9 or later +%global provfilt /bin/sh -c "%{__perl_provides} | grep -Fvx 'perl(Net::SSLeay)'" +%define __perl_provides %{provfilt} + %build PERL_MM_USE_DEFAULT=1 perl Makefile.PL \ INSTALLDIRS=vendor \ @@ -80,6 +81,7 @@ rm -rf %{buildroot} - BR: perl(Test::Kwalitee) if we're not bootstrapping - explicitly BR: pkgconfig - use a patch rather than a scripted iconv to fix the character encoding +- modernize provides filter - nobody else likes macros for commands * Wed Jul 13 2011 Iain Arnell <iarnell@xxxxxxxxx> - 1.36-5 -- 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