From baca6795a61e4cf6d546d988b750bb4c8d6143d0 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Mar 22 2009 18:02:31 +0000
Subject: - Added missing build requirement perl(Test::Deep) for make tests

- Re-diffed make tests patch for more verbosity when skipping tests

---

diff --git a/fix_startup_check.patch b/fix_startup_check.patch
deleted file mode 100644
index ff6efb9..0000000
--- a/fix_startup_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/DBIx/Class/StartupCheck.pm.orig	2008-01-11 14:18:03.729504216 -0800
-+++ lib/DBIx/Class/StartupCheck.pm	2008-01-11 14:18:54.635512980 -0800
-@@ -13,7 +13,7 @@
-     }
- 
-     sub _possibly_has_bad_overload_performance {
--	return $] < 5.008009 && ! _has_bug_34925();
-+	return $] < 5.008009 && _has_bug_34925();
-     }
- 
-     unless ($ENV{DBIC_NO_WARN_BAD_PERL}) {
diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec
index f5d57bb..623151e 100644
--- a/perl-DBIx-Class.spec
+++ b/perl-DBIx-Class.spec
@@ -2,7 +2,7 @@
 
 Name:           perl-DBIx-Class
 Version:        0.08012
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Extensible and flexible object <-> relational mapper
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -13,8 +13,6 @@ BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 ## patches...
-Patch0:         there_is_no_0.73.patch
-Patch2:         fix_startup_check.patch
 # make tests skip a little more verbosely
 Patch3:         verbose.patch
 
@@ -22,8 +20,9 @@ Patch3:         verbose.patch
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(ExtUtils::MakeMaker) 
 BuildRequires:  perl(Scalar::Util) 
-bUIldRequires:  perl(Storable) 
+BuildRequires:  perl(Storable) 
 BuildRequires:  perl(Test::Builder) >= 0.32
+BuildRequires:  perl(Test::Deep)
 
 ## Dependencies
 BuildRequires:  perl(Carp::Clan) 
@@ -82,12 +81,6 @@ DISTINCT, GROUP BY and HAVING support.
 %prep
 %setup -q -n DBIx-Class-%{version}
 
-# correct version reqs in Makefile.PL
-%patch0
-
-# don't complain; as near as I can tell this bug has been nixed in Fedora perl
-%patch2
-
 # tell us why we're skipping, eh?
 %patch3
 
@@ -151,6 +144,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Mar 22 2009 Robert Scheck <robert@fedoraproject.org> 0.08012-3
+- Added missing build requirement perl(Test::Deep) for make tests
+- Re-diffed make tests patch for more verbosity when skipping tests
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.08012-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/there_is_no_0.73.patch b/there_is_no_0.73.patch
deleted file mode 100644
index bf02c08..0000000
--- a/there_is_no_0.73.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.PL.orig	2007-10-18 21:24:19.780115911 -0700
-+++ Makefile.PL	2007-10-18 21:57:59.878232747 -0700
-@@ -23,7 +23,7 @@
- requires 'Encode'                    => 0 if ($] <= 5.008000);  
- 
--build_requires 'DBD::SQLite'         => 1.13;
--build_requires 'Test::Builder'       => 0.33;
-+build_requires 'DBD::SQLite'         => 1.12;
-+build_requires 'Test::Builder'       => 0.32;
- 
- install_script 'script/dbicadmin';
- 
diff --git a/verbose.patch b/verbose.patch
index 3ac3443..c27283a 100644
--- a/verbose.patch
+++ b/verbose.patch
@@ -1,5 +1,5 @@
---- t/86sqlt.t.orig	2008-04-09 18:38:26.386901609 -0700
-+++ t/86sqlt.t	2008-04-09 18:38:42.825891026 -0700
+--- t/86sqlt.t				2009-02-11 00:33:56.000000000 +0100
++++ t/86sqlt.t.verbose			2009-03-22 18:52:18.000000000 +0100
 @@ -6,7 +6,7 @@
  use DBICTest;
  
@@ -9,19 +9,19 @@
  
  my $schema = DBICTest->init_schema;
  
---- t/94versioning.t.orig	2008-04-09 18:40:14.843894626 -0700
-+++ t/94versioning.t	2008-04-09 18:40:29.297893113 -0700
+--- t/94versioning.t				2009-02-11 00:33:56.000000000 +0100
++++ t/94versioning.t.verbose			2009-03-22 18:52:47.000000000 +0100
 @@ -7,7 +7,7 @@
  BEGIN {
-     eval "use DBD::SQLite; use SQL::Translator 0.09;";
+     eval "use DBD::SQLite; use SQL::Translator 0.09003;";
      plan $@
--        ? ( skip_all => 'needs DBD::SQLite and SQL::Translator 0.09 for testing' )
-+        ? ( skip_all => "needs DBD::SQLite and SQL::Translator 0.09 for testing: $@" )
+-        ? ( skip_all => 'needs DBD::SQLite and SQL::Translator 0.09003 for testing' )
++        ? ( skip_all => "needs DBD::SQLite and SQL::Translator 0.09003 for testing: $@" )
          : ( tests => 6 );
  }
  
---- t/cdbi-t/03-subclassing.t.orig	2008-04-09 19:04:38.142892256 -0700
-+++ t/cdbi-t/03-subclassing.t	2008-04-09 19:05:00.557893935 -0700
+--- t/cdbi-t/03-subclassing.t		2009-02-11 00:33:49.000000000 +0100
++++ t/cdbi-t/03-subclassing.t.verbose	2009-03-22 18:53:24.000000000 +0100
 @@ -8,11 +8,11 @@
  BEGIN {
    eval "use DBIx::Class::CDBICompat;";