commit ffa9dc7fc71812e66e9f53a6d9cbd5daa5b26bb3
Author: Petr Šabata <contyk@xxxxxxxxxx>
Date: Tue Feb 12 16:39:06 2013 +0100
0.47 bump
.gitignore | 1 +
Net-SSH2-0.47-op-priority.patch | 22 ++++++++++++++++++++++
perl-Net-SSH2.spec | 31 ++++++++++++++++++++++++-------
sources | 2 +-
4 files changed, 48 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c2d2fe6..233487e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ Net-SSH2-0.28.tar.gz
/Net-SSH2-0.44.tar.gz
/Net-SSH2-0.45.tar.gz
/Net-SSH2-0.46.tar.gz
+/Net-SSH2-0.47.tar.gz
diff --git a/Net-SSH2-0.47-op-priority.patch b/Net-SSH2-0.47-op-priority.patch
new file mode 100644
index 0000000..5f0ed30
--- /dev/null
+++ b/Net-SSH2-0.47-op-priority.patch
@@ -0,0 +1,22 @@
+diff --git a/lib/Net/SSH2.pm b/lib/Net/SSH2.pm
+index 4867f4e..3d7b23c 100644
+--- a/lib/Net/SSH2.pm
++++ b/lib/Net/SSH2.pm
+@@ -279,7 +279,7 @@ sub connect {
+
+ sub _auth_methods {
+ return {
+- ((version())[1]||0 >= 0x010203 ? (
++ (((version())[1]||0) >= 0x010203 ? (
+ 'agent' => {
+ ssh => 'agent',
+ method => \&auth_agent,
+@@ -322,7 +322,7 @@ sub _auth_methods {
+
+ sub _auth_rank {
+ return [
+- ((version())[1]||0 >= 0x010203 ? ('agent') : ()),
++ (((version())[1]||0) >= 0x010203 ? ('agent') : ()),
+ qw(hostbased publickey keyboard keyboard-auto password none)
+ ];
+ }
diff --git a/perl-Net-SSH2.spec b/perl-Net-SSH2.spec
index 9ce9390..d03321d 100644
--- a/perl-Net-SSH2.spec
+++ b/perl-Net-SSH2.spec
@@ -1,41 +1,52 @@
Name: perl-Net-SSH2
-Version: 0.46
+Version: 0.47
Release: 1%{?dist}
Summary: Support for the SSH 2 protocol via libSSH2
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Net-SSH2/
Source0: http://search.cpan.org/CPAN/authors/id/R/RK/RKITOVER/Net-SSH2-%{version}.tar.gz
+# rt#80065, rhbz#864102
+Patch0: Net-SSH2-0.47-op-priority.patch
# Avoid the EE::MM CCFLAGS bug
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
BuildRequires: perl(AutoLoader)
BuildRequires: perl(base)
BuildRequires: perl(Carp)
+BuildRequires: perl(Config)
BuildRequires: perl(Cwd)
-BuildRequires: perl(Devel::CheckLib)
BuildRequires: perl(Exporter)
+BuildRequires: perl(ExtUtils::CBuilder)
BuildRequires: perl(ExtUtils::Constant)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
BuildRequires: perl(ExtUtils::Manifest)
+BuildRequires: perl(ExtUtils::MM_Unix)
+BuildRequires: perl(Fcntl)
+BuildRequires: perl(File::Basename)
+BuildRequires: perl(File::Find)
+BuildRequires: perl(File::Slurp)
BuildRequires: perl(File::Spec)
BuildRequires: perl(File::Temp)
+BuildRequires: perl(FindBin)
BuildRequires: perl(IO::File)
BuildRequires: perl(IO::Scalar)
BuildRequires: perl(IO::Socket::INET)
-BuildRequires: perl(Module::Install)
-BuildRequires: perl(Module::Install::Base)
BuildRequires: perl(Socket)
-BuildRequires: perl(Term::ReadKey)
+BuildRequires: perl(strict)
BuildRequires: perl(Test::More)
BuildRequires: perl(Text::ParseWords)
+BuildRequires: perl(vars)
+BuildRequires: perl(warnings)
BuildRequires: perl(XSLoader)
# non-perl
BuildRequires: zlib-devel
BuildRequires: openssl-devel
BuildRequires: libssh2-devel >= 0.18
+# Drop the tests subpackage; remove during f21 development cycle
+Obsoletes: %{name}-tests%{?_isa} < 0.47-1
+Provides: %{name}-tests%{?_isa} = %{version}-%{release}
%{?perl_default_filter}
-%{?perl_default_subpackage_tests}
%description
Net::SSH2 is a perl interface to the libssh2 (http://www.libssh2.org)
@@ -45,6 +56,7 @@ all of the key exchanges, ciphers, and compression of libssh2.
%prep
%setup -q -n Net-SSH2-%{version}
perl -pi -e 's|^#!perl|#!%{__perl}|' example/*
+%patch0 -p1 -b .op-priority
%build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
@@ -64,10 +76,15 @@ make test
%files
%doc Changes README TODO example/
%{perl_vendorarch}/*
-%exclude %dir %{perl_vendorarch}/auto
%{_mandir}/man3/*
%changelog
+* Tue Feb 12 2013 Petr Šabata <contyk@xxxxxxxxxx> - 0.47-1
+- 0.47 bump
+- Patch the version check (#864102, rt#80065)
+- Drop the useless excludedir
+- Drop the tests subpackage
+
* Tue Nov 13 2012 Petr Šabata <contyk@xxxxxxxxxx> - 0.46-1
- 0.46 bump
diff --git a/sources b/sources
index dd2cae8..dfcbd75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e9b26d96db5a6fe13840827deab95a4 Net-SSH2-0.46.tar.gz
+4a2d2ff7f20a8e940ab238e7bb3879f6 Net-SSH2-0.47.tar.gz
--
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
