From 8c2f8aa4d23cccadc719a44f5ad4182e904b652036ff4ec409118df79c2bce9e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 Jun 2013 16:51:08 +0000 Subject: [PATCH 1/3] Accepting request 180202 from openSUSE:Factory:Staging:perl518 - add fix-pod-syntax.diff to fix build with perl 5.18 OBS-URL: https://build.opensuse.org/request/show/180202 OBS-URL: https://build.opensuse.org/package/show/utilities/gnu_parallel?expand=0&rev=5 --- fix-pod-syntax.diff | 50 ++++++++++++++++++++++++++++++++++++++++++++ gnu_parallel.changes | 5 +++++ gnu_parallel.spec | 2 ++ 3 files changed, 57 insertions(+) create mode 100644 fix-pod-syntax.diff diff --git a/fix-pod-syntax.diff b/fix-pod-syntax.diff new file mode 100644 index 0000000..b150d5a --- /dev/null +++ b/fix-pod-syntax.diff @@ -0,0 +1,50 @@ +Index: parallel-20130422/src/parallel.pod +=================================================================== +--- parallel-20130422.orig/src/parallel.pod ++++ parallel-20130422/src/parallel.pod +@@ -528,18 +528,18 @@ Print a summary of the options to GNU B< + + =over 3 + +-=item 0 ++=item Z<>0 + + Do not halt if a job fails. Exit status will be the number of jobs + failed. This is the default. + +-=item 1 ++=item Z<>1 + + Do not start new jobs if a job fails, but complete the running jobs + including cleanup. The exit status will be the exit status from the + last failing job. + +-=item 2 ++=item Z<>2 + + Kill off all jobs immediately and exit without cleanup. The exit + status will be the exit status from the failing job. +@@ -2752,19 +2752,19 @@ If B<--halt-on-error> 0 or not specified + + =over 6 + +-=item 0 ++=item Z<>0 + + All jobs ran without error. + +-=item 1-253 ++=item Z<>1-253 + + Some of the jobs failed. The exit status gives the number of failed jobs + +-=item 254 ++=item Z<>254 + + More than 253 jobs failed. + +-=item 255 ++=item Z<>255 + + Other error. + diff --git a/gnu_parallel.changes b/gnu_parallel.changes index 5ced56f..3354132 100644 --- a/gnu_parallel.changes +++ b/gnu_parallel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 20 11:36:03 UTC 2013 - coolo@suse.com + +- add fix-pod-syntax.diff to fix build with perl 5.18 + ------------------------------------------------------------------- Wed May 8 17:30:12 UTC 2013 - jengelh@inai.de diff --git a/gnu_parallel.spec b/gnu_parallel.spec index e767629..a37ffb7 100644 --- a/gnu_parallel.spec +++ b/gnu_parallel.spec @@ -28,6 +28,7 @@ Url: http://www.gnu.org/software/parallel/ Source: http://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2 Source2: http://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2.sig Source3: %name.keyring +Patch0: fix-pod-syntax.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} @@ -49,6 +50,7 @@ commands in parallel. %prep %{?gpg_verify: %gpg_verify %{S:2}} %setup -qn parallel-%version +%patch0 -p1 %build %configure --docdir="%_docdir/%name" From 440e09b065066c84f89c776bb341c898d75532730b13a6981f7ac1b57b5207e1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 Jun 2013 21:58:50 +0000 Subject: [PATCH 2/3] Annotate patch OBS-URL: https://build.opensuse.org/package/show/utilities/gnu_parallel?expand=0&rev=6 --- fix-pod-syntax.diff | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fix-pod-syntax.diff b/fix-pod-syntax.diff index b150d5a..f948661 100644 --- a/fix-pod-syntax.diff +++ b/fix-pod-syntax.diff @@ -1,3 +1,7 @@ +From: Stephan Kulow +Date: Thu, 20 Jun 2013 13:36:51 +0200 +References: http://lists.opensuse.org/opensuse-factory/2013-06/msg00383.html + Index: parallel-20130422/src/parallel.pod =================================================================== --- parallel-20130422.orig/src/parallel.pod From 3a2e0d6275e3e8f09c1ecff36544363efaa9f8fd9222a1f38c2c58c6c6343a88 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 Jun 2013 22:09:59 +0000 Subject: [PATCH 3/3] Annotate patch OBS-URL: https://build.opensuse.org/package/show/utilities/gnu_parallel?expand=0&rev=7 --- gnu_parallel.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu_parallel.spec b/gnu_parallel.spec index a37ffb7..636c35e 100644 --- a/gnu_parallel.spec +++ b/gnu_parallel.spec @@ -28,7 +28,7 @@ Url: http://www.gnu.org/software/parallel/ Source: http://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2 Source2: http://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2.sig Source3: %name.keyring -Patch0: fix-pod-syntax.diff +Patch1: fix-pod-syntax.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} @@ -50,7 +50,7 @@ commands in parallel. %prep %{?gpg_verify: %gpg_verify %{S:2}} %setup -qn parallel-%version -%patch0 -p1 +%patch -P 1 -p1 %build %configure --docdir="%_docdir/%name"