commit 51022e22beaf5897b1687a165633f2314baab39b
Author: Paul Howarth <p...@city-fan.org>
Date: Thu Jun 23 09:43:07 2011 +0100
Update fix for spell check test again
.gitignore | 2 +-
Net-SSH-Perl-1.34-stopwords.patch | 36 ++++++++++++++++++++++++----------
perl-Net-SSH-Perl.spec | 38 ++++++++++++++++++++----------------
3 files changed, 47 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d860a2d..2c02c05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Net-SSH-Perl-1.34.tar.gz
+/Net-SSH-Perl-[0-9.]*.tar.gz
diff --git a/Net-SSH-Perl-1.34-stopwords.patch
b/Net-SSH-Perl-1.34-stopwords.patch
index 9bc4fa6..87b9e09 100644
--- a/Net-SSH-Perl-1.34-stopwords.patch
+++ b/Net-SSH-Perl-1.34-stopwords.patch
@@ -1,17 +1,29 @@
diff -up Net-SSH-Perl/Net-SSH-Perl-1.34/t/99-spellcheck.t.orig
Net-SSH-Perl/Net-SSH-Perl-1.34/t/99-spellcheck.t
--- Net-SSH-Perl/Net-SSH-Perl-1.34/t/99-spellcheck.t.orig 2009-01-26
02:05:04.000000000 +0000
-+++ Net-SSH-Perl/Net-SSH-Perl-1.34/t/99-spellcheck.t 2011-02-09
10:50:05.026312613 +0000
-@@ -187,7 +187,9 @@ datatype
++++ Net-SSH-Perl/Net-SSH-Perl-1.34/t/99-spellcheck.t 2011-06-23
09:36:14.534719035 +0100
+@@ -187,7 +187,13 @@ datatype
dbrobins
DBROBINS
de
+decrypt
++decrypted
++decryption
++decrypts
++Decrypts
des
+DES
dev
dgehl
Diffie
-@@ -212,6 +214,7 @@ getpwuid
+@@ -195,6 +201,7 @@ dir
+ Dorrah
+ DSA
+ dss
++EDE
+ eg
+ env
+ ENV
+@@ -212,6 +219,7 @@ getpwuid
getservbyname
GMP
GPL
@@ -19,7 +31,7 @@ diff -up
Net-SSH-Perl/Net-SSH-Perl-1.34/t/99-spellcheck.t.orig Net-SSH-Perl/Net-
hmac
HMAC
hostfile
-@@ -246,6 +249,7 @@ Makefile
+@@ -246,6 +254,7 @@ Makefile
matt
MCPAN
md
@@ -27,25 +39,27 @@ diff -up
Net-SSH-Perl/Net-SSH-Perl-1.34/t/99-spellcheck.t.orig Net-SSH-Perl/Net-
MERCHANTIBILITY
mixup
mpe
-@@ -316,6 +320,7 @@ stdout
+@@ -316,6 +325,8 @@ stdout
STDOUT
str
StringThing
+subclasses
++subclass's
sublicense
substr
subsystems
-@@ -331,6 +336,7 @@ turnstep
+@@ -331,6 +342,8 @@ turnstep
TURNSTEP
Tyrrell
uk
+Ulrich
++unencrypted
untainting
username
usr
diff -up Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE.orig
Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE
--- Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE.orig 2009-02-02
01:18:54.000000000 +0000
-+++ Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE 2011-02-09 10:51:47.989751559
+0000
++++ Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE 2011-06-23 09:36:26.091742983
+0100
@@ -12,7 +12,7 @@ the distribution may already have been c
not run its Makefile.PL or Build.PL.
@@ -60,7 +74,7 @@ diff -up Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE.orig
Net-SSH-Perl/Net-SSH-Perl
SHA1 8d29c2b28ee840cfa6faf6a69985cb87e9ce6725 t/99-perlcritic.t
SHA1 53040aca85aa82e3504d6559cdb0dfee54ea92fc t/99-pod.t
-SHA1 a65c49dc6e81c8d0b6514bf2d313e0b110aa224f t/99-spellcheck.t
-+SHA1 80638ef05c9b820fcdc0e1cf1135e195bf93cff7 t/99-spellcheck.t
++SHA1 56183699d4fdde6ffbceacbe7d09ef65a42d22db t/99-spellcheck.t
SHA1 e78d0a391329bf520fdc748d38002725dca4164c t/99-yaml.t
SHA1 9a32e630c87d1cc3ceaf2b5585519b55d12b79d3 t/config
SHA1 885358760910acc3898301c9af18cd634ddd81a8 t/psshd
@@ -71,7 +85,7 @@ diff -up Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE.orig
Net-SSH-Perl/Net-SSH-Perl
-iEYEAREDAAYFAkmGSf4ACgkQvJuQZxSWSsi5OQCgxH2dv4daZtlsv4DiyC8LMTUS
-a1sAnA6DWrTXcknq0aLBamQtuZW26CcE
-=ew0K
-+iD8DBQFNUnHBemWSzxYcBrERAn6pAJ4gRlcWRRhWelgIX0aDDpdlr7tvKACgpi6P
-+trapq475JWPDSHmGPHxgcug=
-+=ltX8
++iD8DBQFOAvsHemWSzxYcBrERAoXlAJ9M2eF4RBR+Y5vQZQfYJ/47VcoYhgCg9D5G
++8GMxnZWjLHiN7KVpnYQmcZ0=
++=yX94
-----END PGP SIGNATURE-----
diff --git a/perl-Net-SSH-Perl.spec b/perl-Net-SSH-Perl.spec
index b315541..2b0380d 100644
--- a/perl-Net-SSH-Perl.spec
+++ b/perl-Net-SSH-Perl.spec
@@ -4,7 +4,7 @@
Summary: SSH (Secure Shell) client
Name: perl-Net-SSH-Perl
Version: 1.34
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
Url: http://search.cpan.org/dist/Net-SSH-Perl/
@@ -12,8 +12,8 @@ Source0:
http://search.cpan.org/CPAN/authors/id/T/TU/TURNSTEP/Net-SSH-Perl-%{ver
Source1: 14964AC8.asc
Source2: 161C06B1.asc
Patch0: Net-SSH-Perl-1.34-stopwords.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(Term::ReadKey)
BuildArch: noarch
BuildRequires: perl(String::CRC32) >= 1.2
@@ -64,19 +64,19 @@ cd Net-SSH-Perl-%{version}
cd -
# Copy up documentation for convenience with %%doc
-%{__cp} -a Net-SSH-Perl-%{version}/{Changes,README,LICENSE,eg,ToDo} .
+cp -a Net-SSH-Perl-%{version}/{Changes,README,LICENSE,eg,ToDo} .
# Avoid extra deps from examples
-%{__chmod} -x eg/*
+chmod -c -x eg/*
# Create a GPG directory for testing, to avoid using ~/.gnupg
-%{__mkdir} --mode=0700 gnupghome
+mkdir --mode=0700 gnupghome
export GNUPGHOME=$(pwd)/gnupghome
-%{__gpg} --import %{SOURCE1} %{SOURCE2}
+gpg --import %{SOURCE1} %{SOURCE2}
# Remove Crypt::IDEA dep if we're not supporting the IDEA algorithm and we
don't have rpm 4.9
%define bogusreq 'perl(Crypt::IDEA)'
-%global reqfilt /bin/sh -c "%{__perl_requires} | %{__grep} -Fvx %{bogusreq}"
+%global reqfilt /bin/sh -c "%{__perl_requires} | grep -Fvx %{bogusreq}"
%{!?_with_IDEA:%define __perl_requires %{reqfilt}}
%build
@@ -90,25 +90,25 @@ cd Net-SSH-Perl-%{version}
# 1=IDEA 2=DES 3=DES3 4=Blowfish 5=RC4
echo %{?_with_IDEA:1 }2 3 4 5
) |
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
cd -
%install
-%{__rm} -rf %{buildroot}
-%{__make} -C Net-SSH-Perl-%{version} pure_install
PERL_INSTALL_ROOT=%{buildroot}
-/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
-%{__chmod} -R u+w %{buildroot}
+rm -rf %{buildroot}
+make -C Net-SSH-Perl-%{version} pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
+chmod -R u+w %{buildroot}
%check
# Critic and POD tests currently fail
export GNUPGHOME=$(pwd)/gnupghome
-LC_ALL=en_US %{__make} -C Net-SSH-Perl-%{version} test \
+LC_ALL=en_US make -C Net-SSH-Perl-%{version} test \
TEST_AUTHOR=1 TEST_CRITIC=0 TEST_SIGNATURE=1 TEST_SPELL=1
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
@@ -117,6 +117,10 @@ LC_ALL=en_US %{__make} -C Net-SSH-Perl-%{version} test \
%{_mandir}/man3/Net::SSH::Perl*.3pm*
%changelog
+* Thu Jun 23 2011 Paul Howarth <p...@city-fan.org> 1.34-12
+- Nobody else likes macros for commands
+- Update fix for spell check test again
+
* Sat Feb 12 2011 Paul Howarth <p...@city-fan.org> 1.34-11
- Fix dependency filtering for Crypt::IDEA in rpm 4.9
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-de...@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
