From 3c21bb1b764c0dab7155ea48255c83e33d0c2b12 Mon Sep 17 00:00:00 2001 From: "Vojtech Vitek (V-Teq)" Date: Thu, 27 Oct 2011 23:07:40 +0200 Subject: [PATCH] Move patch28 to patch25 (this prevents patch conflict) --- tcsh.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tcsh.spec b/tcsh.spec index 294d9ae..cf416a9 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -34,12 +34,12 @@ Patch22: tcsh-6.17.00-dont-print-history-on-verbose.patch Patch23: tcsh-6.17.00-extrafork.patch # Proposed to upstream (http://bugs.gw.com/view.php?id=122): Patch24: tcsh-6.17.00-avoid-null-cwd.patch +# Accepted by upstream (tcsh-6.17.05b http://mx.gw.com/pipermail/tcsh-bugs/2011-March/000727.html): +Patch25: tcsh-6.17.00-avoid-infinite-loop-pendjob-xprintf.patch # Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=113): Patch26: tcsh-6.17.00-variable-names.patch # Accepted by upstream (tcsh-6.17.06b http://bugs.gw.com/view.php?id=110) Patch27: tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch -# Accepted by upstream (tcsh-6.17.05b http://mx.gw.com/pipermail/tcsh-bugs/2011-March/000727.html): -Patch28: tcsh-6.17.00-avoid-infinite-loop-pendjob-xprintf.patch Provides: csh = %{version} @@ -79,9 +79,9 @@ like syntax. %patch22 -p1 -b .dont-print-history-on-verbose %patch23 -p1 -b .extrafork %patch24 -p1 -b .avoid-null-cwd +%patch25 -p1 -b .avoid-infinite-loop-pendjob-xprintf %patch26 -p1 -b .variable-names %patch27 -p1 -b .status-pipeline-backquote-list-of-cmds -%patch28 -p1 -b .avoid-infinite-loop-pendjob-xprintf for i in Fixes WishList; do iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \