commit 956de127c40f5191358d084f322545e330eed7f1 Author: Ville Skyttà <ville.skytta@xxxxxx> Date: Thu Dec 2 17:46:35 2010 +0200 - Update to 2.50, fixes #658945, #659046. .gitignore | 2 +- perl-Config-General-2.42-system-ixhash.patch | 13 ------------- perl-Config-General-2.50-system-ixhash.patch | 16 ++++++++++++++++ perl-Config-General.spec | 11 +++++++---- sources | 2 +- 5 files changed, 25 insertions(+), 19 deletions(-) --- diff --git a/.gitignore b/.gitignore index ef9bbb6..e1e0b6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -Config-General-2.49.tar.gz +/Config-General-2.50.tar.gz diff --git a/perl-Config-General-2.50-system-ixhash.patch b/perl-Config-General-2.50-system-ixhash.patch new file mode 100644 index 0000000..735e423 --- /dev/null +++ b/perl-Config-General-2.50-system-ixhash.patch @@ -0,0 +1,16 @@ +diff -up Config-General-2.50/t/run.t~ Config-General-2.50/t/run.t +--- Config-General-2.50/t/run.t~ 2010-12-01 12:43:00.000000000 +0200 ++++ Config-General-2.50/t/run.t 2010-12-02 17:37:02.252787307 +0200 +@@ -14,8 +14,11 @@ use Test::More tests => 68; + # ahem, we deliver the test code with a local copy of + # the Tie::IxHash module so we can do tests on sorted + # hashes without dependency to Tie::IxHash. +-use lib qw(t); ++# ahem, in this rpm we don't (we want to test with the system installed one) ++#use lib qw(t); + use Tie::IxHash; ++ ++ + my @WARNINGS_FOUND; + BEGIN { + $SIG{__WARN__} = sub { diag( "WARN: ", join( '', @_ ) ); push @WARNINGS_FOUND, @_ }; diff --git a/perl-Config-General.spec b/perl-Config-General.spec index 690671f..e4a4665 100644 --- a/perl-Config-General.spec +++ b/perl-Config-General.spec @@ -1,13 +1,13 @@ Name: perl-Config-General -Version: 2.49 -Release: 2%{?dist} +Version: 2.50 +Release: 1%{?dist} Summary: Generic configuration module for Perl Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Config-General/ Source0: http://www.cpan.org/authors/id/T/TL/TLINDEN/Config-General-%{version}.tar.gz -Patch0: %{name}-2.42-system-ixhash.patch +Patch0: %{name}-2.50-system-ixhash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -36,7 +36,7 @@ support for object oriented access to the configuration. %prep %setup -q -n Config-General-%{version} %patch0 -p1 -rm -r t/Tie +rm -r t/Tie # see patch0 f=Changelog ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 2 2010 Ville Skyttà <ville.skytta@xxxxxx> - 2.50-1 +- Update to 2.50, fixes #658945, #659046. + * Tue Jun 29 2010 Ville Skyttà <ville.skytta@xxxxxx> - 2.49-2 - Rebuild. diff --git a/sources b/sources index c962fb0..704ad31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5807e73515b2faf1bb26c6603b51103 Config-General-2.49.tar.gz +18d9b00582e8943956b32f8a9ba23380 Config-General-2.50.tar.gz -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel