From 2dab2cff7b9d9ca75f347f2a7984ffa215735197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 4 Dec 2004 15:32:59 +0000
Subject: [PATCH] Sync with fedora.us 0.2605-0.fdr.1.

---
 .cvsignore             |  2 +-
 perl-Module-Build.spec | 18 +++++++++++++++---
 sources                |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 19aba44..0da3826 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Module-Build-0.26.tar.gz
+Module-Build-0.2605.tar.gz
diff --git a/perl-Module-Build.spec b/perl-Module-Build.spec
index be20777..b689905 100644
--- a/perl-Module-Build.spec
+++ b/perl-Module-Build.spec
@@ -1,15 +1,15 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Module-Build
-Version:        0.26
-Release:        0.fdr.1.2
+Version:        0.2605
+Release:        1
 Epoch:          0
 Summary:        Perl module for building and installing Perl modules
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Module-Build/
-Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-0.26.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-0.2605.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,6 +24,11 @@ ExtUtils::MakeMaker.
 
 %prep
 %setup -q -n Module-Build-%{version}
+# See 2004-12-01 changelog entry for rationale for this hack:
+%{__perl} -MTest::Harness::Straps -e \
+  '$Test::Harness::Straps::VERSION < 0.20 &&
+   system("%{__perl} -pi -e \"s/have_yaml = .*/have_yaml = 0;/\" \\
+             t/runthrough.t")'
 
 
 %build
@@ -55,6 +60,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  1 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.2605-1
+- Update to 0.2605.
+- Disable some tests if Test::Harness::Straps is < 0.20 to avoid failing
+  when the default @INC is longish, such as in FC3 Perl.
+  http://sourceforge.net/mailarchive/forum.php?thread_id=6056820&forum_id=10905
+  http://rt.cpan.org/NoAuth/Bug.html?id=5649
+
 * Sun Oct 10 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.26-0.fdr.1
 - Update to 0.26.
 
diff --git a/sources b/sources
index a068e1d..427c64a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bba1994a3db2a53401d45cf69c25347a  Module-Build-0.26.tar.gz
+bd58160de80e8d9c5ca6aa7bb603b6ca  Module-Build-0.2605.tar.gz