From 06655004e24e178d4c3ba12f57c63abfda993460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 29 Sep 2015 16:06:05 +0200 Subject: [PATCH] 0.55 bump - Source URL updated --- .gitignore | 1 + Net-SSH2-0.47-op-priority.patch | 22 ---------- perl-Net-SSH2.spec | 74 ++++++++++++++++++--------------- sources | 2 +- 4 files changed, 42 insertions(+), 57 deletions(-) delete mode 100644 Net-SSH2-0.47-op-priority.patch diff --git a/.gitignore b/.gitignore index d34b09d..c3a2877 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ Net-SSH2-0.28.tar.gz /Net-SSH2-0.50.tar.gz /Net-SSH2-0.52.tar.gz /Net-SSH2-0.53.tar.gz +/Net-SSH2-0.55.tar.gz diff --git a/Net-SSH2-0.47-op-priority.patch b/Net-SSH2-0.47-op-priority.patch deleted file mode 100644 index 5f0ed30..0000000 --- a/Net-SSH2-0.47-op-priority.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 7d72c7d..728a416 100644 --- a/perl-Net-SSH2.spec +++ b/perl-Net-SSH2.spec @@ -1,51 +1,54 @@ Name: perl-Net-SSH2 -Version: 0.53 -Release: 6%{?dist} +Version: 0.55 +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)) +Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Net-SSH2-%{version}.tar.gz +# Build +BuildRequires: findutils +BuildRequires: libgcrypt-devel +BuildRequires: libssh2-devel >= 0.18 +BuildRequires: make +BuildRequires: openssl-devel BuildRequires: perl -BuildRequires: perl(AutoLoader) BuildRequires: perl(base) -BuildRequires: perl(Carp) BuildRequires: perl(Config) BuildRequires: perl(Cwd) -BuildRequires: perl(Exporter) -BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(ExtUtils::Constant) -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 -BuildRequires: perl(ExtUtils::Manifest) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(ExtUtils::MM_Unix) BuildRequires: perl(Fcntl) -BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Copy) BuildRequires: perl(File::Find) -BuildRequires: perl(File::Slurp) +BuildRequires: perl(File::Path) 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(Socket) 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} +# Runtime +BuildRequires: perl(AutoLoader) +BuildRequires: perl(Carp) +BuildRequires: perl(File::Basename) +BuildRequires: perl(IO::File) +# IO::Socket::IP is preferred +# XXX: BuildRequires: perl(IO::Socket::INET) +BuildRequires: perl(IO::Socket::IP) +BuildRequires: perl(Socket) +BuildRequires: perl(Term::ReadKey) +BuildRequires: perl(XSLoader) +# Tests only +BuildRequires: perl(Test::More) +# Optional tests only +BuildRequires: perl(File::Slurp) +BuildRequires: perl(IO::Scalar) +Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) +Requires: perl(IO::Socket::IP) +Recommends: perl(Term::ReadKey) %{?perl_default_filter} @@ -57,16 +60,14 @@ 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}" +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 make %{?_smp_mflags} %install make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} + -find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} + +find %{buildroot} -type f -name '*.bs' -size 0 -delete %{_fixperms} %{buildroot}/* %check @@ -75,11 +76,16 @@ find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} + make test %files -%doc Changes README TODO example/ -%{perl_vendorarch}/* +%doc Changes README TODO example +%{perl_vendorarch}/auto/* +%{perl_vendorarch}/Net* %{_mandir}/man3/* %changelog +* Tue Sep 29 2015 Petr Šabata - 0.55-1 +- 0.55 bump +- Source URL updated + * Thu Jun 18 2015 Fedora Release Engineering - 0.53-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index a3f7989..b90f80e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8a2c3ebb3bd191635e00a68a3d5f015 Net-SSH2-0.53.tar.gz +ca80c31a1f8b7fc33d846fc2ca5ecc22 Net-SSH2-0.55.tar.gz