Include a copy of late Test-Simple for test, the version in el6 is too old

- BR perl(IO::Pty) for running more tests
Merge branch 'master' into el6
2014-03-29 16:11:44 +08:00 · 2014-03-29 15:06:03 +08:00 · 2012-01-25 16:52:19 +08:00 · 2011-04-21 21:35:26 -07:00 · 2010-09-02 21:38:40 -07:00 · 2010-07-28 09:34:22 +00:00
3 changed files with 14 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,3 +5,4 @@
 /ack-2.08.tar.gz
 /ack-2.10.tar.gz
 /ack-2.12.tar.gz
+/Test-Simple-1.001003.tar.gz
--- a/ack.spec
+++ b/ack.spec
@ -1,11 +1,13 @@
 Name:           ack
 Version:        2.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Grep-like text finder
 License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://betterthangrep.com/
 Source0:        http://www.cpan.org/modules/by-module/App/%{name}-%{version}.tar.gz
+# Ack requires a late Test::More to run the tests
+Source1:        http://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/Test-Simple-1.001003.tar.gz
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::Basename)
@ -16,7 +18,9 @@ BuildRequires:  perl(Pod::Usage)
 BuildRequires:  perl(Term::ANSIColor)
 BuildRequires:  perl(Text::ParseWords) >= 3.1
 BuildRequires:  perl(Test::Harness) >= 2.5
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(IO::Pty)
+# We use a local copy of late Test::More
+#BuildRequires:  perl(Test::More) >= 0.98
 BuildRequires:  perl(Test::Pod)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

@ -39,7 +43,8 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_fixperms} $RPM_BUILD_ROOT/*

 %check
-make test
+tar zfx %SOURCE1
+PERLLIB=Test-Simple-1.001003/lib make test

 %files
 %doc Changes LICENSE.md README.md
@ -49,6 +54,10 @@ make test


 %changelog
+* Sat Mar 29 2014 Robin Lee <cheeselee@fedoraproject.org> - 2.12-2
+- Include a copy of late Test-Simple for test, the version in el6 is too old
+- BR perl(IO::Pty) for running more tests
+
 * Wed Dec 11 2013 Robin Lee <cheeselee@fedoraproject.org> - 2.12-1
 - Update to 2.12
 - fixes BZ#1040228, BZ#1040229,
@ -100,12 +109,6 @@ make test
 * Thu Apr 21 2011  <ianburrell@gmail.com> - 1.94-1
 - Update to 1.94

-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.92-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Aug  4 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.92-2
- rebuild with perl-5.12.1 again
-
 * Wed Jun 16 2010 Ian Burrell <ianburrell@gmail.com> - 1.92-1
 - Update to 1.92

--- a/1
+++ b/1
@ -1 +1,2 @@
 11e886ab0ec72173869a82e59227ddf2  ack-2.12.tar.gz
+527ae49633648f281ccab8e759d313be  Test-Simple-1.001003.tar.gz
Author	SHA1	Message	Date
Robin Lee	a536ca88a7	Include a copy of late Test-Simple for test, the version in el6 is too old - BR perl(IO::Pty) for running more tests	2014-03-29 16:11:44 +08:00
Robin Lee	57def9502e	Merge branch 'master' into el6	2014-03-29 15:06:03 +08:00
Robin Lee	2d55e34a6d	Merge branch 'master' into el6	2012-01-25 16:52:19 +08:00
Ian Burrell	ba76edaed5	Merge branch 'master' into el6 * master: Remove README Update to 1.94 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild Conflicts: .gitignore	2011-04-21 21:35:26 -07:00
Ian Burrell	1dcd44942b	Merge branch 'f14' into el6 * f14: * Wed Aug 4 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.92-2 - rebuild with perl-5.12.1 again dist-git conversion Update to 1.92 - Mass rebuild with perl-5.12.0 - rebuild against perl 5.10.1 Fix typo that causes a failure to update the common directory. (releng #2781) Conflicts: .gitignore	2010-09-02 21:38:40 -07:00
Fedora Release Engineering	05c56af663	dist-git conversion	2010-07-28 09:34:22 +00:00
Dennis Gilmore	3d27b582fd	Initialize branch EL-6 for ack	2010-05-08 01:42:26 +00:00
Bill Nottingham	0144a859c1	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:24:43 +00:00