remove 0001 patch
This commit is contained in:
parent
85a9d2d2d7
commit
aea4773555
|
@ -1,126 +0,0 @@
|
|||
From f035e9770cb51a4eb505bdfb88b40864ccda131f Mon Sep 17 00:00:00 2001
|
||||
From: Paul Howarth <paul@city-fan.org>
|
||||
Date: Thu, 6 Feb 2014 09:44:33 +0000
|
||||
Subject: [PATCH] =?UTF-8?q?Avoid=20the=20need=20for=20Test::More=20?=
|
||||
=?UTF-8?q?=E2=89=A5=200.94?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
---
|
||||
Perlbal-1.80-old-Test::More.patch | 59 +++++++++++++++++++++++++++++++++++++++
|
||||
Perlbal.spec | 12 ++++----
|
||||
2 files changed, 66 insertions(+), 5 deletions(-)
|
||||
create mode 100644 Perlbal-1.80-old-Test::More.patch
|
||||
|
||||
diff --git a/Perlbal-1.80-old-Test::More.patch b/Perlbal-1.80-old-Test::More.patch
|
||||
new file mode 100644
|
||||
index 0000000..edfd9b5
|
||||
--- /dev/null
|
||||
+++ b/Perlbal-1.80-old-Test::More.patch
|
||||
@@ -0,0 +1,59 @@
|
||||
+--- t/91-fields.t
|
||||
++++ t/91-fields.t
|
||||
+@@ -2,7 +2,7 @@
|
||||
+ use warnings;
|
||||
+ use Carp;
|
||||
+
|
||||
+-use Test::More 0.94 tests => 6; # last test to print
|
||||
++use Test::More 0.88 tests => 7; # last test to print
|
||||
+ use Hash::Util;
|
||||
+
|
||||
+ my $warn_mocked =
|
||||
+@@ -13,9 +13,9 @@
|
||||
+ }
|
||||
+
|
||||
+ SKIP: {
|
||||
+- skip "perl need to be greater than 5.009", 1 if ( $] < 5.009 );
|
||||
++ skip "perl need to be greater than 5.009", 2 if ( $] < 5.009 );
|
||||
+
|
||||
+- subtest 'before using Perlbal::Fields' => sub {
|
||||
++ {
|
||||
+ use_ok('Perlbal::CommandContext');
|
||||
+ eval { Perlbal::CommandContext->new(); };
|
||||
+ like( $@, qr{$warn_mocked}, "use old library" );
|
||||
+--- t/99-benchmark-bool.t
|
||||
++++ t/99-benchmark-bool.t
|
||||
+@@ -1,7 +1,7 @@
|
||||
+ use strict;
|
||||
+ use warnings;
|
||||
+
|
||||
+-use Test::More 0.94 tests => 5; # last test to print
|
||||
++use Test::More 0.88 tests => 6; # last test to print
|
||||
+
|
||||
+ for my $class (qw/Perlbal Perlbal::Service/) {
|
||||
+ use_ok( $class, "can load module $class" );
|
||||
+@@ -9,13 +9,13 @@
|
||||
+
|
||||
+ my $class = 'Perlbal::Service';
|
||||
+
|
||||
+-subtest 'module checking' => sub {
|
||||
++{
|
||||
+ isa_ok( $class->new(), $class, "can create object from $class" );
|
||||
+ };
|
||||
+
|
||||
+ my @words = generate_words(1000);
|
||||
+
|
||||
+-subtest 'check sub integrity' => sub {
|
||||
++{
|
||||
+ is_deeply( test_optimized(), test_original(), "sub optimized" );
|
||||
+ is_deeply( test_hash(), test_original(), "sub hash" );
|
||||
+ };
|
||||
+@@ -23,7 +23,7 @@
|
||||
+ SKIP: {
|
||||
+ skip "need Benchmark module", 1 unless eval "require Benchmark";
|
||||
+
|
||||
+- subtest 'benchmark bool sub' => sub {
|
||||
++ {
|
||||
+ use_ok('Benchmark');
|
||||
+ timethese(
|
||||
+ shift || 100000,
|
||||
diff --git a/Perlbal.spec b/Perlbal.spec
|
||||
index 244292d..6db677e 100644
|
||||
--- a/Perlbal.spec
|
||||
+++ b/Perlbal.spec
|
||||
@@ -7,24 +7,23 @@ Group: System Environment/Daemons
|
||||
URL: http://search.cpan.org/dist/Perlbal/
|
||||
Source0: http://www.laqee.unal.edu.co/CPAN/authors/id/D/DO/DORMANDO/%{name}-%{version}.tar.gz
|
||||
Source1: perlbal.init
|
||||
+Patch0: Perlbal-1.80-old-Test::More.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
-#BuildRequires: perl(Test::More)
|
||||
+BuildRequires: perl(Test::More) >= 0.88
|
||||
BuildRequires: perl(HTTP::Date)
|
||||
BuildRequires: perl(HTTP::Response)
|
||||
BuildRequires: perl(BSD::Resource)
|
||||
BuildRequires: perl(Danga::Socket)
|
||||
BuildRequires: perl(IO::AIO)
|
||||
BuildRequires: perl(Net::Netmask)
|
||||
-BuildRequires: perl(Test::Simple)
|
||||
|
||||
-Requires: perl(Test::Simple)
|
||||
-#Requires: perl(Test::More)
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||
-Requires: perl(IO::AIO)
|
||||
Requires: perl(BSD::Resource)
|
||||
+Requires: perl(IO::AIO)
|
||||
+Requires: perl(Net::Netmask)
|
||||
Requires: perl(Perlbal::XS::HTTPHeaders)
|
||||
|
||||
Requires(post): /sbin/chkconfig
|
||||
@@ -47,6 +46,9 @@ can override many parts of request handling and behavior.
|
||||
%prep
|
||||
%setup -q -n Perlbal-%{version}
|
||||
|
||||
+# Avoid the need for Test::More ≥ 0.94
|
||||
+%patch0
|
||||
+
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor
|
||||
make %{?_smp_mflags}
|
||||
--
|
||||
1.8.5.3
|
||||
|
Loading…
Reference in New Issue