commit c821acd4733234ea1e4e17e44bfbb0c3530cd7fa Author: Jitka Plesnikova <jplesnik@xxxxxxxxxx> Date: Wed May 30 14:24:40 2012 +0200 Fix find2perl to translate ? glob properly ...ind2perl-transtate-question-mark-properly.patch | 13 +++++++++++++ perl.spec | 10 +++++++++- 2 files changed, 22 insertions(+), 1 deletions(-) --- diff --git a/perl-5.14.2-find2perl-transtate-question-mark-properly.patch b/perl-5.14.2-find2perl-transtate-question-mark-properly.patch new file mode 100644 index 0000000..e81be8d --- /dev/null +++ b/perl-5.14.2-find2perl-transtate-question-mark-properly.patch @@ -0,0 +1,13 @@ +diff -up a/x2p/find2perl.PL b/x2p/find2perl.PL +--- a/x2p/find2perl.PL 2010-12-30 03:07:17.000000000 +0100 ++++ b/x2p/find2perl.PL 2012-05-29 10:18:11.697683643 +0200 +@@ -681,7 +681,8 @@ sub tab () { + sub fileglob_to_re ($) { + my $x = shift; + $x =~ s#([./^\$()+])#\\$1#g; +- $x =~ s#([?*])#.$1#g; ++ $x =~ s#\*#.*#g; ++ $x =~ s#\?#.#g; + "^$x\\z"; + } + diff --git a/perl.spec b/perl.spec index fa7f4ae..62e3093 100644 --- a/perl.spec +++ b/perl.spec @@ -22,7 +22,7 @@ Name: perl Version: %{perl_version} # release number must be even higher, because dual-lived modules will be broken otherwise -Release: 197%{?dist} +Release: 198%{?dist} Epoch: %{perl_epoch} Summary: Practical Extraction and Report Language Group: Development/Languages @@ -93,6 +93,9 @@ Patch14: perl-5.14.2-Signal-handlers-must-run-before-sigsuspend-returns.p # Stop !$^V from leaking, rhbz#787613, RT#109762, fixed after 5.15.7. Patch15: perl-5.14.2-Stop-V-from-leaking.patch +# Fix find2perl to translate ? glob properly, rhbz#825701, RT#113054 +Patch16: perl-5.14.2-find2perl-transtate-question-mark-properly.patch + # Update some of the bundled modules # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions @@ -1141,6 +1144,7 @@ tarball from perl.org. %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 #copy the example script cp -a %{SOURCE5} . @@ -1337,6 +1341,7 @@ pushd %{build_archlib}/CORE/ 'Fedora Patch13: Fix searching for Unicode::Collate::Locale data' \ 'Fedora Patch14: Run signal handlers before returning from sigsuspend' \ 'Fedora Patch15: Stop !$^V from leaking' \ + 'Fedora Patch16: Fix find2perl to translate ? glob properly (RT#113054)' \ %{nil} rm patchlevel.bak @@ -2222,6 +2227,9 @@ sed \ # Old changelog entries are preserved in CVS. %changelog +* Tue May 29 2012 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 4:5.14.2-198 +- Fix find2perl to translate ? glob properly (bug #825701) + * Thu Feb 23 2012 Paul Howarth <paul@xxxxxxxxxxxx> - 4:5.14.2-197 - Add %%exclude entries for Socket sub-package so as not to duplicate its files in the main perl package -- 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