From aec249b3c57d98911cb10246a257579fa848da60 Mon Sep 17 00:00:00 2001
From: Robin Norwood <rnorwood@fedoraproject.org>
Date: Thu, 7 Jun 2007 19:41:07 +0000
Subject: [PATCH] Update to latest CPAN version: 1.56

---
 .cvsignore             |  2 +-
 filter-requires-dbi.sh |  3 ---
 perl-DBI.spec          | 42 ++++++++++++++++++++++++++++++++----------
 sources                |  2 +-
 4 files changed, 34 insertions(+), 15 deletions(-)
 delete mode 100755 filter-requires-dbi.sh

diff --git a/.cvsignore b/.cvsignore
index 6497f1b..4e3e524 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-DBI-1.53.tar.gz
+DBI-1.56.tar.gz
diff --git a/filter-requires-dbi.sh b/filter-requires-dbi.sh
deleted file mode 100755
index e234c36..0000000
--- a/filter-requires-dbi.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/lib/rpm/find-requires $* | grep -v 'perl(RPC::' |grep -v 'perl(Apache'
diff --git a/perl-DBI.spec b/perl-DBI.spec
index e58fee5..dab06c0 100644
--- a/perl-DBI.spec
+++ b/perl-DBI.spec
@@ -1,20 +1,17 @@
 Name:           perl-DBI
-Version:        1.53
-Release:        2%{?dist}
+Version:        1.56
+Release:        1%{?dist}
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://dbi.perl.org/
 Source0:        http://www.cpan.org/authors/id/T/TI/TIMB/DBI-%{version}.tar.gz
-Source1:        filter-requires-dbi.sh
-Patch0:         perl-DBI-1.37-prever.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl, perl(ExtUtils::MakeMaker), perl(Test::Pod)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-%define __perl_requires %{SOURCE1}
-
 %description 
 DBI is a database access Application Programming Interface (API) for
 the Perl Language. The DBI API Specification defines a set of
@@ -24,12 +21,21 @@ database interface independent of the actual database being used.
 
 %prep
 %setup -q -n DBI-%{version} 
-%patch0 -p1
 chmod 644 ex/*
 
+# Filter unwanted Requires:
+cat << EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+  sed -e '/perl(RPC::/d'
+EOF
+
+%define __perl_requires %{_builddir}/DBI-%{version}/%{name}-req
+chmod +x %{__perl_requires}
+
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,7 +49,15 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 rm -rf $RPM_BUILD_ROOT%{perl_vendorarch}/{Win32,DBI/W32ODBC.pm}
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/{DBI::W32ODBC.3pm,Win32::DBIODBC.3pm}
 
-%check || :
+# This particular man page is not UTF8 for some reason
+pushd $RPM_BUILD_ROOT%{_mandir}/man3/
+/usr/bin/iconv -f iso8859-1 -t utf-8 DBD::Gofer.3pm > DBD::Gofer.3pm.conv && /bin/mv -f DBD::Gofer.3pm.conv DBD::Gofer.3pm
+popd
+
+perl -pi -e 's"#!perl -w"#!/usr/bin/perl"' $RPM_BUILD_ROOT%{perl_vendorarch}/goferperf.pl
+
+
+%check
 make test
 
 %clean
@@ -54,6 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README ex/
 %{_bindir}/dbipro*
+%{_bindir}/dbilogstrip
 %{perl_vendorarch}/*.p*
 %{perl_vendorarch}/Bundle/
 %{perl_vendorarch}/DBD/
@@ -64,6 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 07 2007 Robin Norwood <rnorwood@redhat.com> - 1.56-1
+- Update to latest CPAN version: 1.56
+- Move the filter requires step into %%prep
+- Remove very old patch (for perl 5.8.1)
+- Fix a couple of rpmlint issues (non-UTF8 manpage and script with
+  incorrect shebang line
+
 * Sat Dec 02 2006 Robin Norwood <rnorwood@redhat.com> - 1.53-1
 - Upgrade to latest CPAN version: 1.53
 
diff --git a/sources b/sources
index a8aa805..5df83ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e76dfeeb37eb7346342a49142d36171d  DBI-1.53.tar.gz
+5471f8a968943dae1971d55bbfafc844  DBI-1.56.tar.gz