From 4941c926c3d565b2a9952c6560184a173be99529 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 28 Jul 2008 15:10:39 +0000 Subject: [PATCH] - update to 1.35 - drop flag and patch for enabling/disabling external tests - patch now upstream - external hosts patch no longer needed as we don't do external tests - filter out unversioned provide for perl(Net::SSLeay) - use the distro openssl flags rather than guessing them --- .cvsignore | 2 +- perl-Net-SSLeay-1.32-external-hosts.patch | 15 ---------- perl-Net-SSLeay-1.32-notests.patch | 11 -------- perl-Net-SSLeay.spec | 34 +++++++++++++---------- sources | 2 +- 5 files changed, 21 insertions(+), 43 deletions(-) delete mode 100644 perl-Net-SSLeay-1.32-external-hosts.patch delete mode 100644 perl-Net-SSLeay-1.32-notests.patch diff --git a/.cvsignore b/.cvsignore index 52fc928..2df986f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Net-SSLeay-1.32.tar.gz +Net-SSLeay-1.35.tar.gz diff --git a/perl-Net-SSLeay-1.32-external-hosts.patch b/perl-Net-SSLeay-1.32-external-hosts.patch deleted file mode 100644 index 68e15d0..0000000 --- a/perl-Net-SSLeay-1.32-external-hosts.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Net-SSLeay-1.32/t/handle/external/10_destroy.t 2007-11-28 15:11:57.000000000 +0000 -+++ Net-SSLeay-1.32/t/handle/external/10_destroy.t 2007-11-28 15:10:59.000000000 +0000 -@@ -5,9 +5,9 @@ - use Test::More; - - my @uris = qw( -- debianforum.de -- bacus.pt -- perldition.org -+ admin.fedoraproject.org -+ bugzilla.redhat.com -+ www.redhat.com - ); - - plan tests => scalar @uris * 2; diff --git a/perl-Net-SSLeay-1.32-notests.patch b/perl-Net-SSLeay-1.32-notests.patch deleted file mode 100644 index 6735a85..0000000 --- a/perl-Net-SSLeay-1.32-notests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Net-SSLeay-1.32/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2007-11-28 14:25:12.000000000 +0000 -+++ Net-SSLeay-1.32/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2007-11-28 14:19:28.000000000 +0000 -@@ -48,7 +48,7 @@ - if ( $self->prompt( - "Do you want to run external tests?\n". - "These tests *will* *fail* if you do not have network connectivity.", -- 'y', -+ 'n', - ) =~ /^y/i ) { - $self->tests('t/*/*.t t/*/*/*.t'); - } else { diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec index 4040ce8..a9ba205 100644 --- a/perl-Net-SSLeay.spec +++ b/perl-Net-SSLeay.spec @@ -1,23 +1,17 @@ -# -# Rebuild switch: -# --with externaltests enable external network tests -# - Name: perl-Net-SSLeay -Version: 1.32 -Release: 5%{?dist} +Version: 1.35 +Release: 1%{?dist} Summary: Perl extension for using OpenSSL Group: Development/Libraries License: OpenSSL URL: http://search.cpan.org/dist/Net-SSLeay/ Source0: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-%{version}.tar.gz -Patch0: perl-Net-SSLeay-1.32-notests.patch -Patch1: perl-Net-SSLeay-1.32-external-hosts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(ExtUtils::MakeMaker), openssl-devel BuildRequires: perl(Array::Compare), perl(MIME::Base64), perl(Sub::Uplevel) -BuildRequires: perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod), perl(Test::Warn), perl(Tree::DAG_Node) +BuildRequires: perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod) +BuildRequires: perl(Test::Warn), perl(Tree::DAG_Node) %description This module offers some high level convenience functions for accessing @@ -28,10 +22,6 @@ so you can write servers or clients for more complicated applications. %prep %setup -q -n Net-SSLeay-%{version} -%if 0%{!?_with_externaltests:1} -%patch0 -p1 -b .notests -%endif -%patch1 -p1 -b .hosts %{__chmod} -c 644 examples/* %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl for f in Credits lib/Net/SSLeay.pm; do @@ -39,9 +29,16 @@ 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 OPTIMIZE="%{optflags}" + INSTALLDIRS=vendor \ + INC="$(/usr/bin/pkg-config --cflags-only-I openssl)" \ + LIBS="$(/usr/bin/pkg-config --libs openssl)" \ + OPTIMIZE="%{optflags}" %{__make} %{?_smp_mflags} %install @@ -67,6 +64,13 @@ PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \ %{_mandir}/man3/Net::SSLeay*.3* %changelog +* Mon Jul 28 2008 Paul Howarth - 1.35-1 +- update to 1.35 +- drop flag and patch for enabling/disabling external tests - patch now upstream +- external hosts patch no longer needed as we don't do external tests +- filter out unversioned provide for perl(Net::SSLeay) +- 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) diff --git a/sources b/sources index 3efc623..38f7336 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e0918a7101633f06cfe4f7ca005917e Net-SSLeay-1.32.tar.gz +1e4ec37a4467eb66a62d3c090ac9029b Net-SSLeay-1.35.tar.gz