From 6a5998230c31a742ac794368ab8c8a294e1db2ab Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mar 08 2009 20:43:45 +0000 Subject: - filter out unwanted provides for perl shared objects - run tests in verbose mode --- diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec index ad4fcd9..18d1012 100644 --- a/perl-Net-SSLeay.spec +++ b/perl-Net-SSLeay.spec @@ -1,6 +1,6 @@ Name: perl-Net-SSLeay Version: 1.35 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Perl extension for using OpenSSL Group: Development/Libraries License: OpenSSL @@ -13,6 +13,12 @@ BuildRequires: perl(Array::Compare), perl(MIME::Base64), perl(Sub::Uplevel) BuildRequires: perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod) BuildRequires: perl(Test::Warn), perl(Tree::DAG_Node) +# 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 | /bin/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}" + %description This module offers some high level convenience functions for accessing web pages on SSL servers (for symmetry, same API is offered for @@ -29,10 +35,6 @@ for f in Credits lib/Net/SSLeay.pm; do %{__mv} ${f}.utf8 ${f} done -# Remove redundant provides (there's also a versioned one) -%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 \ @@ -46,12 +48,12 @@ PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \ %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot} /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';' /usr/bin/find %{buildroot} -type f -name '*.bs' -empty -exec %{__rm} -f {} ';' -/usr/bin/find %{buildroot} -depth -type d -exec %{__rmdir} {} 2>/dev/null ';' +/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} 2>/dev/null ';' %{__rm} -f %{buildroot}%{perl_vendorarch}/Net/ptrtstrun.pl %{__chmod} -R u+w %{buildroot}/* %check -%{__make} test +%{__make} test TEST_VERBOSE=1 %clean %{__rm} -rf %{buildroot} @@ -64,8 +66,12 @@ PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \ %{_mandir}/man3/Net::SSLeay*.3* %changelog +* Sun Mar 8 2009 Paul Howarth - 1.35-4 +- filter out unwanted provides for perl shared objects +- run tests in verbose mode + * Thu Feb 26 2009 Fedora Release Engineering - 1.35-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Sat Jan 17 2009 Tomas Mraz - 1.35-2 - rebuild with new openssl @@ -78,10 +84,10 @@ PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \ - use the distro openssl flags rather than guessing them * Wed Feb 27 2008 Tom "spot" Callaway - 1.32-5 -- Rebuild for perl 5.10 (again) +- rebuild for perl 5.10 (again) * Tue Feb 19 2008 Fedora Release Engineering - 1.32-4 -- Autorebuild for GCC 4.3 +- autorebuild for GCC 4.3 * Thu Jan 31 2008 Tom "spot" Callaway - 1.32-3 - rebuild for new perl