- updated to 1.48

- removed obsolete paths patch

Changed files:
    perl-Net-SSLeay-paths.patch -> 1.4
    perl-Net-SSLeay.spec -> 1.71

diff --git a/perl-Net-SSLeay-paths.patch b/perl-Net-SSLeay-paths.patch
deleted file mode 100644 (file)
index 1b7c3f0..0000000
--- a/perl-Net-SSLeay-paths.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -urN Net-SSLeay-1.36.org/examples/bio.pl Net-SSLeay-1.36/examples/bio.pl
---- Net-SSLeay-1.36.org/examples/bio.pl        2007-10-16 10:26:45.000000000 +0200
-+++ Net-SSLeay-1.36/examples/bio.pl    2010-04-11 11:23:59.500407002 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- # bio.pl mikem@open.com.au
- #
- # Test and demonstrate BIO interface
-diff -urN Net-SSLeay-1.36.org/examples/bulk.pl Net-SSLeay-1.36/examples/bulk.pl
---- Net-SSLeay-1.36.org/examples/bulk.pl       2007-10-16 10:26:45.000000000 +0200
-+++ Net-SSLeay-1.36/examples/bulk.pl   2010-04-11 11:23:59.503115868 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- # bulk.pl - 8.6.1998, Sampo Kellomaki <sampo@iki.fi>
- # Send tons of stuff over SSL (just for testing).
- # There's also an example about using the call back.
-diff -urN Net-SSLeay-1.36.org/examples/callback.pl Net-SSLeay-1.36/examples/callback.pl
---- Net-SSLeay-1.36.org/examples/callback.pl   2007-10-16 10:26:45.000000000 +0200
-+++ Net-SSLeay-1.36/examples/callback.pl       2010-04-11 11:23:59.503115868 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- # callback.pl - 8.6.1998, Sampo Kellomaki <sampo@iki.fi>
- # 31.7.1999, fixed callback args, --Sampo 
- # 7.4.2001,  adapted to 0.9.6a and numerous bug reports --Sampo
-diff -urN Net-SSLeay-1.36.org/examples/cli-cert.pl Net-SSLeay-1.36/examples/cli-cert.pl
---- Net-SSLeay-1.36.org/examples/cli-cert.pl   2007-10-16 10:26:45.000000000 +0200
-+++ Net-SSLeay-1.36/examples/cli-cert.pl       2010-04-11 11:23:59.503115868 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # cli-cert.pl
- # 8.6.1998, originally written as stdio_bulk.pl Sampo Kellomaki <sampo@iki.fi>
- # 8.12.2001, adapted to test client certificates
-diff -urN Net-SSLeay-1.36.org/examples/ephemeral.pl Net-SSLeay-1.36/examples/ephemeral.pl
---- Net-SSLeay-1.36.org/examples/ephemeral.pl  2007-10-16 10:26:45.000000000 +0200
-+++ Net-SSLeay-1.36/examples/ephemeral.pl      2010-04-11 11:23:59.503115868 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- # ephemeral.pl mikem@open.com.au
- #
- # Test and demonstrate setting ephemeral RSA key
-diff -urN Net-SSLeay-1.36.org/examples/minicli.pl Net-SSLeay-1.36/examples/minicli.pl
---- Net-SSLeay-1.36.org/examples/minicli.pl    2007-10-16 10:26:45.000000000 +0200
-+++ Net-SSLeay-1.36/examples/minicli.pl        2010-04-11 11:23:59.507073715 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # minicli.pl - Sampo Kellomaki <sampo@iki.fi>
- 
- use Socket;
-diff -urN Net-SSLeay-1.36.org/examples/passwd-cb.pl Net-SSLeay-1.36/examples/passwd-cb.pl
---- Net-SSLeay-1.36.org/examples/passwd-cb.pl  2007-10-16 10:26:45.000000000 +0200
-+++ Net-SSLeay-1.36/examples/passwd-cb.pl      2010-04-11 11:23:59.507073715 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # passwd-cb.pl
- #
- # Check using password callbacks to decrypt private keys
-diff -urN Net-SSLeay-1.36.org/examples/stdio_bulk.pl Net-SSLeay-1.36/examples/stdio_bulk.pl
---- Net-SSLeay-1.36.org/examples/stdio_bulk.pl 2007-10-16 10:26:45.000000000 +0200
-+++ Net-SSLeay-1.36/examples/stdio_bulk.pl     2010-04-11 11:23:59.507073715 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # stdio_bulk.pl - 8.6.1998, Sampo Kellomaki <sampo@iki.fi>
- # Send tons of stuff over SSL connected by STDIO pipe.
- # This also demonstrates how you can communicate via arbitrary stream, not
-diff -urN Net-SSLeay-1.36.org/lib/Net/SSLeay.pm Net-SSLeay-1.36/lib/Net/SSLeay.pm
---- Net-SSLeay-1.36.org/lib/Net/SSLeay.pm      2010-01-30 22:07:38.000000000 +0100
-+++ Net-SSLeay-1.36/lib/Net/SSLeay.pm  2010-04-11 11:25:10.780816683 +0200
-@@ -1304,7 +1304,7 @@
- 
- The following is a simple SSLeay client (with too little error checking :-(
- 
--    #!/usr/local/bin/perl
-+    #!/usr/bin/perl
-     use Socket;
-     use Net::SSLeay qw(die_now die_if_ssl_error) ;
-     Net::SSLeay::load_error_strings();
-@@ -1345,7 +1345,7 @@
- 
- The following is a simple SSLeay echo server (non forking):
- 
--    #!/usr/local/bin/perl -w
-+    #!/usr/bin/perl -w
-     use Socket;
-     use Net::SSLeay qw(die_now die_if_ssl_error);
-     Net::SSLeay::load_error_strings();
-@@ -1408,7 +1408,7 @@
- it had better be without any encryption or else it will not know where
- to ask for the password. Note how C<STDIN> and C<STDOUT> are wired to SSL.
- 
--    #!/usr/local/bin/perl
-+    #!/usr/bin/perl
-     # /etc/inetd.conf
-     #    ssltst stream tcp nowait root /path/to/server.pl server.pl
-     # /etc/services

diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec
index 4d3f17d8304bf5d1984086b7f25ee3df31ecbb8e..ebe061b09eac6012cba4067ded6879c1b9dabc7d 100644 (file)
--- a/perl-Net-SSLeay.spec
+++ b/perl-Net-SSLeay.spec
@@ -6,20 +6,23 @@
 Summary:       Net::SSLeay - Perl extension for using OpenSSL or SSLeay
 Summary(pl.UTF-8):     Net::SSLeay - rozszerzenie Perla do używania OpenSSL lub SSLeay
 Name:          perl-Net-SSLeay
-Version:       1.36
-Release:       5
+Version:       1.48
+Release:       1
 # same as openssl
 License:       Apache-like
 Group:         Development/Languages/Perl
-Source0:       http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-%{version}.tar.gz
-# Source0-md5: 54061638720dd6a325395331c77f21d8
-Patch0:                %{name}-paths.patch
-Patch1:                %{name}-no_zlib.patch
+Source0:       http://www.cpan.org/modules/by-module/Net/Net-SSLeay-%{version}.tar.gz
+# Source0-md5: 4e10d9da28f26732e37807820bf72af5
+Patch0:                %{name}-no_zlib.patch
 URL:           http://search.cpan.org/dist/Net-SSLeay/
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: openssl-tools >= 0.9.7d
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
+%if %{with tests}
+BuildRequires: perl-MIME-Base64
+BuildRequires: perl-Test-Simple >= 0.60_01
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,7 +41,6 @@ aplikacji.
 %prep
 %setup -q -n Net-SSLeay-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 echo "n" | %{__perl} Makefile.PL %{_prefix} \
@@ -58,6 +60,8 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install examples/*.{pl,conf} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Net/SSLeay.pod
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{perl_vendorarch}/auto/Net/SSLeay
 %{perl_vendorarch}/auto/Net/SSLeay/autosplit.ix
 %{perl_vendorarch}/auto/Net/SSLeay/*.al
-%{perl_vendorarch}/auto/Net/SSLeay/*.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/Net/SSLeay/*.so
-%{_mandir}/man3/*
+%{perl_vendorarch}/auto/Net/SSLeay/SSLeay.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/Net/SSLeay/SSLeay.so
+%{_mandir}/man3/Net::SSLeay*.3pm*
 %{_examplesdir}/%{name}-%{version}