From fa29a6a2e3fac9d35d98eb189c31485b40d67640 Mon Sep 17 00:00:00 2001 From: Robin Norwood Date: Jun 04 2007 20:08:11 +0000 Subject: Update to latest CPAN version: 5.9 --- diff --git a/perl-Carp-Clan-no-prompt-Makefile.patch b/perl-Carp-Clan-no-prompt-Makefile.patch new file mode 100644 index 0000000..3fbbf68 --- /dev/null +++ b/perl-Carp-Clan-no-prompt-Makefile.patch @@ -0,0 +1,21 @@ +--- Carp-Clan-5.9/Makefile.PL.orig 2007-06-04 15:50:47.000000000 -0400 ++++ Carp-Clan-5.9/Makefile.PL 2007-06-04 15:52:00.000000000 -0400 +@@ -11,12 +11,12 @@ + # dependency and is resolved by installing Carp::Clan without + # Object::Deadly. Once Object::Deadly is installed, Carp::Clan may use + # it for testing. +-if (prompt( 'Add Object::Deadly 0.08+ to prerequisites for testing? [Ny]', +- 'no' ) =~ /^y/i +- ) +-{ +- $PREREQ_PM{'Object::Deadly'} = '0.08'; +-} ++#if (prompt( 'Add Object::Deadly 0.08+ to prerequisites for testing? [Ny]', ++# 'no' ) =~ /^y/i ++# ) ++#{ ++# $PREREQ_PM{'Object::Deadly'} = '0.08'; ++#} + + WriteMakefile( + NAME => 'Carp::Clan', diff --git a/perl-Carp-Clan.spec b/perl-Carp-Clan.spec index fc23a1b..49291a4 100644 --- a/perl-Carp-Clan.spec +++ b/perl-Carp-Clan.spec @@ -1,16 +1,18 @@ Name: perl-Carp-Clan -Version: 5.8 -Release: 2%{?dist} +Version: 5.9 +Release: 1%{?dist} Summary: Report errors from perspective of caller of a "clan" of modules Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Carp-Clan/ -Source0: http://www.cpan.org/authors/id/S/ST/STBEY/Carp-Clan-5.8.tar.gz +Source0: http://www.cpan.org/authors/id/J/JJ/JJORE/Carp-Clan-%{version}.tar.gz +# The upstream Makefile.PL prompts for user input. Don't do that. +Patch1: perl-Carp-Clan-no-prompt-Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl >= 1:5.6.1, perl(Test::Exception) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -23,6 +25,7 @@ which shall never be blamed for any error. %prep %setup -q -n Carp-Clan-%{version} +%patch1 -p1 # Filter unwanted Provides: cat << EOF > %{name}-prov @@ -60,6 +63,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 04 2007 Robin Norwood - 5.9-1 +- Update to latest CPAN version: 5.9 +- Upstream Makefile.PL prompts for user input to include + Object::Deadly as a prerequisite. We don't ship Object::Deadly, so + just comment out the prompt. + * Fri Jan 26 2007 Robin Norwood - 5.8-2 - Resolves: bz#224571 - Remove erroneous rpm 'provides' of perl(DB)