diff --git a/tcsh-6.15.00-history.dif b/tcsh-6.15.00-history.dif index c62ba5b..38d39a5 100644 --- a/tcsh-6.15.00-history.dif +++ b/tcsh-6.15.00-history.dif @@ -37,16 +37,6 @@ + if (!(flags & ERR_INTERRUPT)) + reset(); /* Unwind */ } ---- sh.err.h -+++ sh.err.h 2007-10-15 11:21:24.718454966 +0200 -@@ -5,6 +5,7 @@ - #define ERR_NAME 0x10000000 - #define ERR_SILENT 0x20000000 - #define ERR_OLD 0x40000000 -+#define ERR_INTERRUPT 0x80000000 - #define ERR_SYNTAX 0 - #define ERR_NOTALLOWED 1 - #define ERR_WTOOLONG 2 --- sh.h +++ sh.h 2007-10-12 00:00:00.000000000 +0200 @@ -548,6 +548,7 @@ EXTERN int neednote IZERO; /* Need to diff --git a/tcsh.changes b/tcsh.changes index fdbdd2b..540324e 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 20 12:53:13 CET 2007 - werner@suse.de + +- Oops ... also apply the patch for bug ##331627 (bug #349577) + ------------------------------------------------------------------- Mon Oct 15 12:11:06 CEST 2007 - werner@suse.de diff --git a/tcsh.spec b/tcsh.spec index 1c42940..1a625fa 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -18,7 +18,7 @@ Group: System/Shells Requires: gawk textutils AutoReqProv: on Version: 6.15.00 -Release: 25 +Release: 35 Summary: The C SHell Source: ftp.astron.com:/pub/tcsh/tcsh-6.15.00.tar.bz2 Source1: nls-iconv @@ -54,6 +54,7 @@ Authors: %patch3 -p0 -b .pipe %patch4 -p0 -b .longjmp %patch5 -p0 -b .normcmd +%patch6 -p0 -b .history %patch sh $RPM_SOURCE_DIR/nls-iconv @@ -134,7 +135,10 @@ Authors: %doc %{_mandir}/man1/csh.1.gz %doc %{_mandir}/man1/tcsh.1.gz %{_datadir}/locale/*/LC_MESSAGES/tcsh + %changelog +* Thu Dec 20 2007 - werner@suse.de +- Oops ... also apply the patch for bug ##331627 (bug #349577) * Mon Oct 15 2007 - werner@suse.de - Improve bug fix (bug #331627) * Fri Oct 12 2007 - werner@suse.de