diff --git a/.cvsignore b/.cvsignore index 1e6a364..d03ffb8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Parse-RecDescent-1.963.tar.gz +Parse-RecDescent-1.964.tar.gz diff --git a/Parse-RecDescent-1.963-rt54457.patch b/Parse-RecDescent-1.963-rt54457.patch deleted file mode 100644 index 8aef826..0000000 --- a/Parse-RecDescent-1.963-rt54457.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up Parse-RecDescent-1.963/lib/Parse/RecDescent.pm.old Parse-RecDescent-1.963/lib/Parse/RecDescent.pm ---- Parse-RecDescent-1.963/lib/Parse/RecDescent.pm.old 2010-01-20 23:13:19.000000000 +0100 -+++ Parse-RecDescent-1.963/lib/Parse/RecDescent.pm 2010-02-16 11:46:33.475648895 +0100 -@@ -2363,11 +2363,12 @@ sub _generate($$$;$$) - } - elsif ($grammar =~ m/$LITERAL/gco) - { -- ($code = $1) =~ s/\\\\/\\/g; -- _parse("a literal terminal", $aftererror,$line,$1); -+ my $literal = $1; -+ ($code = $literal) =~ s/\\\\/\\/g; -+ _parse("a literal terminal", $aftererror,$line,$literal); - $item = new Parse::RecDescent::Literal($code,$lookahead,$line); - $prod and $prod->additem($item) -- or _no_rule("literal terminal",$line,"'$1'"); -+ or _no_rule("literal terminal",$line,"'$literal'"); - } - elsif ($grammar =~ m/$INTERPLIT/gco) - { diff --git a/perl-Parse-RecDescent.spec b/perl-Parse-RecDescent.spec index 81652af..91b4da7 100644 --- a/perl-Parse-RecDescent.spec +++ b/perl-Parse-RecDescent.spec @@ -1,6 +1,6 @@ Name: perl-Parse-RecDescent -Version: 1.963 -Release: 2%{?dist} +Version: 1.964 +Release: 1%{?dist} Summary: Parse-RecDescent Perl module Group: Development/Libraries @@ -8,7 +8,6 @@ License: GPL+ or Artistic URL: http://search.cpan.org/dist/Parse-RecDescent/ Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Parse-RecDescent-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Patch0: Parse-RecDescent-1.963-rt54457.patch BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker), perl(version), perl(Test::More) BuildRequires: perl(Test::Pod) @@ -41,7 +40,6 @@ matching productions. %prep %setup -q -n Parse-RecDescent-%{version} -%patch0 -p1 chmod a-x demo/* tutorial/* %{__perl} -pi -e 's|^#!\s?/usr/local/bin/perl\b|#!%{__perl}|' demo/* @@ -80,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 19 2010 Marcela Mašláňová 1.964-1 +- update, fix previous issue and https://rt.cpan.org/Public/Bug/Display.html?id=53948 + * Tue Feb 16 2010 Marcela Mašláňová 1.963-2 - apply upstream patch https://rt.cpan.org/Public/Bug/Display.html?id=54457 which should fix problems with rebuilds of other modules diff --git a/sources b/sources index baec542..722ae53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9ff7942e8f576697e08662932acdec0 Parse-RecDescent-1.963.tar.gz +3fdefd70384af44a16337c734e5b5baf Parse-RecDescent-1.964.tar.gz