From d7f98751f799177f066b47581af1377422980f7b Mon Sep 17 00:00:00 2001
From: "Vojtech Vitek (V-Teq)" <vvitek@redhat.com>
Date: Wed, 26 Oct 2011 15:02:20 +0200
Subject: [PATCH] Clean-up patches numbers & order (prepare space for missing
 RHEL-6 patches)

- No functionality changes
---
 tcsh.spec | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/tcsh.spec b/tcsh.spec
index 96a586a..9bcdcc7 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -19,22 +19,24 @@ Patch11: tcsh-6.14.00-order.patch
 Patch12: tcsh-6.15.00-rs-color.patch
 Patch13: tcsh-6.17.00-mh-color.patch
 # Accepted by upstream:
-Patch15: tcsh-6.17.00-history.patch
+Patch14: tcsh-6.17.00-history.patch
 # Accepted by upstream:
-Patch16: tcsh-6.17.00-printexitvalue.patch
-Patch17: tcsh-6.17.00-testsuite.patch
-# Accepted by upstream:
-Patch18: tcsh-6.17.00-extrafork.patch
+Patch15: tcsh-6.17.00-printexitvalue.patch
+Patch16: tcsh-6.17.00-testsuite.patch
 # Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=109):
 Patch19: tcsh-6.17.00-wait-intr.patch
 # Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=112):
 Patch21: tcsh-6.17.00-dont-set-empty-remotehost.patch
 # Patch by upstream (tcsh-6.17.01b http://mx.gw.com/pipermail/tcsh-bugs/2010-May/000673.html):
 Patch22: tcsh-6.17.00-dont-print-history-on-verbose.patch
+# Accepted by upstream:
+Patch23: tcsh-6.17.00-extrafork.patch
 # Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=113):
-Patch23: tcsh-6.17.00-variable-names.patch
+Patch26: tcsh-6.17.00-variable-names.patch
 # Accepted by upstream (tcsh-6.17.05b http://mx.gw.com/pipermail/tcsh-bugs/2011-March/000727.html):
-Patch24: tcsh-6.17.00-avoid-infinite-loop-pendjob-xprintf.patch
+Patch28: tcsh-6.17.00-avoid-infinite-loop-pendjob-xprintf.patch
+
+
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -63,15 +65,15 @@ like syntax.
 %patch11 -p1 -b .order
 %patch12 -p1 -b .rs-color
 %patch13 -p1 -b .mh-color
-%patch15 -p1 -b .history
-%patch16 -p1 -b .printexitvalue
-%patch17 -p1 -b .testsuite
-%patch18 -p1 -b .extrafork
+%patch14 -p1 -b .history
+%patch15 -p1 -b .printexitvalue
+%patch16 -p1 -b .testsuite
 %patch19 -p1 -b .wait-intr
 %patch21 -p1 -b .dont-set-empty-remotehost
 %patch22 -p1 -b .dont-print-history-on-verbose
-%patch23 -p1 -b .variable-names
-%patch24 -p1 -b .avoid-infinite-loop-pendjob-xprintf
+%patch23 -p1 -b .extrafork
+%patch26 -p1 -b .variable-names
+%patch28 -p1 -b .avoid-infinite-loop-pendjob-xprintf
 
 for i in Fixes WishList; do
  iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -145,6 +147,7 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+- Clean-up patches numbers & order (prepare space for missing RHEL-6 patches)
 - Disable obsolete glob-automount.patch; The issue should have been
   (and is now) fixed in glibc (posix/glob.c)