rpms/perl/F-12 perl-5.10.0-Encode-err.patch, NONE, 1.1 perl.spec, 1.236, 1.237

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16035

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-Encode-err.patch 
Log Message:
Fix #rhbz547121 - paths to Encode.


perl-5.10.0-Encode-err.patch:
 Encode.pm |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE perl-5.10.0-Encode-err.patch ---
2008-07-21  Stepan Kasal  <skasal at redhat.com>

	* ext/Encode/Encode.pm backport fix for #435505 from Encode-2.26

--- perl-5.8.8/ext/Encode/Encode.pm.orig	2005-09-28 17:17:24.000000000 +0200
+++ perl-5.8.8/ext/Encode/Encode.pm	2008-07-21 14:20:59.987668000 +0200
@@ -49,7 +49,14 @@
 our %Encoding;
 our %ExtModule;
 require Encode::Config;
-eval { require Encode::ConfigLocal };
+# See
+# https://bugzilla.redhat.com/show_bug.cgi?id=435505#c2
+# to find why sig handers inside eval{} are disabled.
+eval {
+    local $SIG{__DIE__};
+    local $SIG{__WARN__};
+    require Encode::ConfigLocal;
+};
 
 sub encodings
 {


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/F-12/perl.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- perl.spec	1 Dec 2009 15:15:30 -0000	1.236
+++ perl.spec	11 Jan 2010 14:32:12 -0000	1.237
@@ -193,6 +193,10 @@ Patch60:	perl-skip-prereq.patch
 # RT #60508
 Patch61:	perl-5.10.0-much-better-swap-logic.patch
 
+# fix paths to Encode
+# http://rt.cpan.org/Public/Bug/Display.html?id=11511#txn-481431
+Patch62:        perl-5.10.0-Encode-err.patch
+
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
 Patch100:	perl-update-constant.patch
@@ -1008,6 +1012,7 @@ upstream tarball from perl.org.
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
+%patch62 -p1
 
 %patch100 -p1
 %patch101 -p1