diff --git a/perl-5.19.0-Synchronize-h2ph-POD-text-with-usage-output.patch b/perl-5.19.0-Synchronize-h2ph-POD-text-with-usage-output.patch new file mode 100644 index 0000000..25d32df --- /dev/null +++ b/perl-5.19.0-Synchronize-h2ph-POD-text-with-usage-output.patch @@ -0,0 +1,38 @@ +From fe89bf70817551c30bcacaef25578ffeb7d71eb1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Sun, 9 Jun 2013 14:01:49 -0400 +Subject: [PATCH] Synchronize h2ph POD text with usage output + +--- + utils/h2ph.PL | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/utils/h2ph.PL b/utils/h2ph.PL +index a2d737b..9a8b14d 100644 +--- a/utils/h2ph.PL ++++ b/utils/h2ph.PL +@@ -866,7 +866,8 @@ h2ph - convert .h C header files to .ph Perl header files + + =head1 SYNOPSIS + +-B ++B + + =head1 DESCRIPTION + +@@ -932,6 +933,11 @@ you will see the slightly more helpful + + However, the B<.ph> files almost double in size when built using B<-h>. + ++=item -e ++ ++If an error is encountered during conversion, output file will be removed and ++a warning emitted instead of terminating the conversion immediately. ++ + =item -D + + Include the code from the B<.h> file as a comment in the B<.ph> file. +-- +1.8.1.4 + diff --git a/perl.spec b/perl.spec index d3223c5..88caf21 100644 --- a/perl.spec +++ b/perl.spec @@ -126,6 +126,9 @@ Patch25: perl-5.17.9-106212-Add-PL_perlio_mutex-to-atfork_lock.patch # RT#114878, fixed after 5.17.11 Patch26: perl-5.16.3-Remove-PERL_ASYNC_CHECK-from-Perl_leave_scope.patch +# Update h2ph(1) documentation, rhbz#948538, RT#117647 +Patch27: perl-5.19.0-Synchronize-h2ph-POD-text-with-usage-output.patch + # Update some of the bundled modules # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions @@ -1930,6 +1933,7 @@ tarball from perl.org. %patch24 -p1 %patch25 -p1 %patch26 -p1 +%patch27 -p1 #copy the example script cp -a %{SOURCE5} . @@ -2146,6 +2150,7 @@ pushd %{build_archlib}/CORE/ 'Fedora Patch24: Fix leaking tied hashes (RT#107000) [3]' \ 'Fedora Patch25: Fix dead lock in PerlIO after fork from thread (RT106212)' \ 'Fedora Patch26: Make regexp safe in a signal handler (RT#114878)' \ + 'Fedora Patch27: Update h2ph(1) documentation (RT#117647)' \ %{nil} rm patchlevel.bak @@ -3638,6 +3643,7 @@ sed \ * Wed Jun 12 2013 Petr Pisar - 4:5.16.3-278 - Update SystemTap scripts to recognize new phase__change marker and new probe arguments (bug #971094) +- Update h2ph(1) documentation (bug #948538) * Tue Jun 11 2013 Petr Pisar - 4:5.16.3-277 - Move CPANPLUS-Dist-Build files from perl-CPANPLUS