rpms/perl-Parse-RecDescent/devel Parse-RecDescent-1.963-rt54457.patch, NONE, 1.1 perl-Parse-RecDescent.spec, 1.22, 1.23

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/perl-Parse-RecDescent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20719

Modified Files:
	perl-Parse-RecDescent.spec 
Added Files:
	Parse-RecDescent-1.963-rt54457.patch 
Log Message:
* Tue Feb 16 2010 Marcela Mašláňová <mmaslano at redhat.com> 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


Parse-RecDescent-1.963-rt54457.patch:
 RecDescent.pm |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE Parse-RecDescent-1.963-rt54457.patch ---
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)
         {


Index: perl-Parse-RecDescent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Parse-RecDescent/devel/perl-Parse-RecDescent.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- perl-Parse-RecDescent.spec	9 Feb 2010 15:17:30 -0000	1.22
+++ perl-Parse-RecDescent.spec	16 Feb 2010 10:51:49 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-Parse-RecDescent
 Version:        1.963
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parse-RecDescent Perl module
 
 Group:          Development/Libraries
@@ -8,7 +8,7 @@ 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,6 +41,8 @@ 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/*
 %{__perl} -pi -e 's|^#!\s?/opt/local/bin/perl5\.10\.0\b|#!%{__perl}|' demo/*
@@ -56,7 +58,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
@@ -78,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 16 2010 Marcela Mašláňová <mmaslano at redhat.com> 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
+
 * Tue Feb  9 2010 Paul Howarth <paul at city-fan.org> 1.963-1
 - update to 1.963 (fix subtle bug in leftop and rightop due to removal of $&)
 - recode Changes as utf-8