From fbe6a24471f505df9886620971172f1baae1f943 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 16 Dec 2014 10:27:26 +0000 Subject: [PATCH] Update to 0.94 - New upstream release 0.94 - Update License discrepancies (CPAN RT#100858) - Many typo corrections - Fix t/pty.t fails on Solaris 10 (CPAN RT#20105) - Drop upstreamed patch for CPAN RT#20105 - Use %license --- .gitignore | 5 +-- IPC-Run-0.92-RT20105.patch | 68 -------------------------------------- perl-IPC-Run.spec | 30 +++++++++++------ sources | 2 +- 4 files changed, 22 insertions(+), 83 deletions(-) delete mode 100644 IPC-Run-0.92-RT20105.patch diff --git a/.gitignore b/.gitignore index 375c648..a6dd6ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -IPC-Run-0.84.tar.gz -/IPC-Run-0.89.tar.gz -/IPC-Run-0.92.tar.gz -/IPC-Run-0.93.tar.gz +/IPC-Run-[0-9.]*.tar.gz diff --git a/IPC-Run-0.92-RT20105.patch b/IPC-Run-0.92-RT20105.patch deleted file mode 100644 index e508d57..0000000 --- a/IPC-Run-0.92-RT20105.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8e6730d0c0f3db2c89a0dad07f67082c7eb88321 Mon Sep 17 00:00:00 2001 -From: Slaven Rezic -Date: Sat, 28 Dec 2013 10:55:28 +0100 -Subject: [PATCH] fix pty.t test failures on linux - ---- - t/pty.t | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/t/pty.t b/t/pty.t -index 42591a4..6d99b21 100644 ---- a/t/pty.t -+++ b/t/pty.t -@@ -141,14 +141,14 @@ $fd_map = _map_fds; - $h = start \@echoer, \$in, '>pty>', \$out; - $in = "hello\n"; - $? = 0; --pump $h until $out =~ /hello/; -+pump $h until $out =~ /hello\r?\n/; - ## We assume that the slave's write()s are atomic - $exp = qr/^(?:hello\r?\n){2}(?!\n)$/i; - $out =~ $exp ? ok( 1 ) : is( $out, $exp ); - is( $in, '' ); - $in = "world\n"; - $? = 0; --pump $h until $out =~ /world/; -+pump $h until $out =~ /world\r?\n/; - $exp = qr/^(?:hello\r?\n){2}(?:world\r?\n){2}(?!\n)$/i; - $out =~ $exp ? ok( 1 ) : is( $out, $exp ); - is( $in, '' ); -@@ -165,7 +165,7 @@ $fd_map = _map_fds; - $h = start \@echoer, \$in, '>pty>', \$out, '2>', \$err; - $in = "hello\n"; - $? = 0; --pump $h until $out =~ /hello/ && $err =~ /HELLO/; -+pump $h until $out =~ /hello\r?\n/ && $err =~ /HELLO/; - $exp = qr/^hello\r?\n(?!\n)$/; - $out =~ $exp ? ok( 1 ) : is( $out, $exp ); - $exp = qr/^HELLO\n(?!\n)$/; -@@ -173,7 +173,7 @@ $err =~ $exp ? ok( 1 ) : is( $err, $exp ); - is( $in, '' ); - $in = "world\n"; - $? = 0; --pump $h until $out =~ /world/ && $err =~ /WORLD/; -+pump $h until $out =~ /world\r?\n/ && $err =~ /WORLD/; - $exp = qr/^hello\r?\nworld\r?\n(?!\n)$/; - $out =~ $exp ? ok( 1 ) : is( $out, $exp ); - $exp = qr/^HELLO\nWORLD\n(?!\n)$/ , -@@ -192,14 +192,14 @@ $fd_map = _map_fds; - $h = start \@echoer, 'pty>', \$out; - $in = "hello\n"; - $? = 0; --pump $h until $out =~ /hello.*hello.*hello/is; -+pump $h until $out =~ /hello.*hello.*hello\r?\n/is; - ## We assume that the slave's write()s are atomic - $exp = qr/^(?:hello\r?\n){3}(?!\n)$/i; - $out =~ $exp ? ok( 1 ) : is( $out, $exp ); - is( $in, '' ); - $in = "world\n"; - $? = 0; --pump $h until $out =~ /world.*world.*world/is; -+pump $h until $out =~ /world.*world.*world\r?\n/is; - $exp = qr/^(?:hello\r?\n){3}(?:world\r?\n){3}(?!\n)$/i; - $out =~ $exp ? ok( 1 ) : is( $out, $exp ); - is( $in, '' ); --- -1.7.10.4 - diff --git a/perl-IPC-Run.spec b/perl-IPC-Run.spec index e881381..9263c6d 100644 --- a/perl-IPC-Run.spec +++ b/perl-IPC-Run.spec @@ -1,5 +1,5 @@ Name: perl-IPC-Run -Version: 0.93 +Version: 0.94 Release: 1%{?dist} Summary: Perl module for interacting with child processes # the rest: GPL+ or Artistic @@ -11,8 +11,8 @@ License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IPC-Run/ Source0: http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/IPC-Run-%{version}.tar.gz -Patch0: http://cpan.cpantesters.org/authors/id/S/SR/SREZIC/patches/IPC-Run-0.92-RT20105.patch BuildArch: noarch +# Build BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) # IO::Pty not needed strictly for build script @@ -25,6 +25,7 @@ BuildRequires: perl(Data::Dumper) BuildRequires: perl(Errno) BuildRequires: perl(Exporter) BuildRequires: perl(Fcntl) +BuildRequires: perl(File::Basename) BuildRequires: perl(File::Spec) BuildRequires: perl(IO::Handle) BuildRequires: perl(IO::Pty) >= 1.08 @@ -38,10 +39,13 @@ BuildRequires: perl(vars) # Win32::Process not used on Linux # Win32API::File not used on Linux # Tests: +BuildRequires: perl(IO::Tty) BuildRequires: perl(Test::More) >= 0.47 BuildRequires: perl(warnings) +# Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Data::Dumper) +Requires: perl(File::Basename) Requires: perl(IO::Pty) >= 1.08 %description @@ -56,9 +60,6 @@ and DOS command lines are provided. %prep %setup -q -n IPC-Run-%{version} -# Address intermittent test failures (CPAN RT#20105, RH BZ#1094395) -%patch0 -p1 - # Remove Windows-only features that could add unnecessary dependencies rm -f lib/IPC/Run/Win32* sed -i -e '/^lib\/IPC\/Run\/Win32.*/d' MANIFEST @@ -83,15 +84,24 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \; make test %files -%doc Changes LICENSE README TODO +%license LICENSE +%doc Changes README TODO %doc abuse/ eg/ %{perl_vendorlib}/IPC/ -%{_mandir}/man3/IPC::Run.3pm* -%{_mandir}/man3/IPC::Run::Debug.3pm* -%{_mandir}/man3/IPC::Run::IO.3pm* -%{_mandir}/man3/IPC::Run::Timer.3pm* +%{_mandir}/man3/IPC::Run.3* +%{_mandir}/man3/IPC::Run::Debug.3* +%{_mandir}/man3/IPC::Run::IO.3* +%{_mandir}/man3/IPC::Run::Timer.3* %changelog +* Mon Dec 15 2014 Paul Howarth - 0.94-1 +- Update to 0.94 + - Update License discrepancies (CPAN RT#100858) + - Many typo corrections + - Fix t/pty.t fails on Solaris 10 (CPAN RT#20105) +- Drop upstreamed patch for CPAN RT#20105 +- Use %%license + * Thu Dec 11 2014 Petr Pisar - 0.93-1 - 0.93 bump diff --git a/sources b/sources index 27421dd..8da247b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -744475b46cfc6a0c2d243f8c84ff044d IPC-Run-0.93.tar.gz +c963902894d3796b16624b3b4aea94b4 IPC-Run-0.94.tar.gz