rpms/tcsh/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tcsh-6.14.00-syntax.patch, 1.1, 1.2 tcsh-6.15.00-ca-color.patch, 1.2, 1.3 tcsh-6.15.00-rs-color.patch, 1.1, 1.2 tcsh.spec, 1.62, 1.63 tcsh-6.15.00-wide-str.patch, 1.1, NONE

[vcrhonek]

Author: vcrhonek

Update of /cvs/extras/rpms/tcsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29828

Modified Files:
	.cvsignore sources tcsh-6.14.00-syntax.patch 
	tcsh-6.15.00-ca-color.patch tcsh-6.15.00-rs-color.patch 
	tcsh.spec 
Removed Files:
	tcsh-6.15.00-wide-str.patch 
Log Message:
Update to tcsh-6.17.00


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	28 Apr 2009 15:50:16 -0000	1.8
+++ .cvsignore	20 Jul 2009 13:25:46 -0000	1.9
@@ -1,3 +1,4 @@
 tcsh-6.14.00.tar.gz
 tcsh-6.15.00.tar.gz
 tcsh-6.16.00.tar.gz
+tcsh-6.17.00.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	28 Apr 2009 15:50:16 -0000	1.8
+++ sources	20 Jul 2009 13:25:46 -0000	1.9
@@ -1 +1 @@
-55f1a41512250168ec4bf1db0e246db4  tcsh-6.16.00.tar.gz
+c47de903e3d52f6824c8dd0c91eeb477  tcsh-6.17.00.tar.gz

tcsh-6.14.00-syntax.patch:
 sh.func.c |   13 -------------
 1 file changed, 13 deletions(-)

Index: tcsh-6.14.00-syntax.patch
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh-6.14.00-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tcsh-6.14.00-syntax.patch	3 Sep 2008 11:50:36 -0000	1.1
+++ tcsh-6.14.00-syntax.patch	20 Jul 2009 13:25:46 -0000	1.2
@@ -1,16 +1,16 @@
-diff -up tcsh-6.15.00/sh.func.c.syntax tcsh-6.15.00/sh.func.c
---- tcsh-6.15.00/sh.func.c.syntax	2006-08-24 22:56:31.000000000 +0200
-+++ tcsh-6.15.00/sh.func.c	2008-09-03 11:53:05.000000000 +0200
-@@ -751,8 +751,6 @@ search(int type, int level, Char *goal)
+diff -up tcsh-6.17.00/sh.func.c_old tcsh-6.17.00/sh.func.c
+--- tcsh-6.17.00/sh.func.c_old	2009-07-20 14:54:16.000000000 +0200
++++ tcsh-6.17.00/sh.func.c	2009-07-20 14:55:34.000000000 +0200
+@@ -753,8 +753,6 @@ search(int type, int level, Char *goal)
  {
      struct Strbuf word = Strbuf_INIT;
      Char *cp;
 -    struct whyle *wp;
 -    int wlevel = 0;
+     struct wordent *histent = NULL, *ohistent = NULL;
  
      Stype = type;
-     Sgoal = goal;
-@@ -791,24 +789,13 @@ search(int type, int level, Char *goal)
+@@ -811,24 +809,13 @@ search(int type, int level, Char *goal)
  
  	case TC_FOREACH:
  	case TC_WHILE:

tcsh-6.15.00-ca-color.patch:
 tw.color.c |    1 +
 1 file changed, 1 insertion(+)

Index: tcsh-6.15.00-ca-color.patch
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh-6.15.00-ca-color.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tcsh-6.15.00-ca-color.patch	29 Aug 2008 10:42:02 -0000	1.2
+++ tcsh-6.15.00-ca-color.patch	20 Jul 2009 13:25:46 -0000	1.3
@@ -1,10 +1,10 @@
-diff -up tcsh-6.15.00/tw.color.c.ca-color tcsh-6.15.00/tw.color.c
---- tcsh-6.15.00/tw.color.c.ca-color	2006-03-02 19:46:45.000000000 +0100
-+++ tcsh-6.15.00/tw.color.c	2008-08-29 12:37:53.000000000 +0200
-@@ -85,6 +85,7 @@ static Variable variables[] = {
-     VAR(NOS, "tw", ""),		/* Sticky and other writable dir (+t,o+w) */
+diff -up tcsh-6.17.00/tw.color.c_old tcsh-6.17.00/tw.color.c
+--- tcsh-6.17.00/tw.color.c_old	2009-07-20 14:35:59.000000000 +0200
++++ tcsh-6.17.00/tw.color.c	2009-07-20 14:36:54.000000000 +0200
+@@ -86,6 +86,7 @@ static Variable variables[] = {
      VAR(NOS, "ow", ""),		/* Other writable dir (o+w) but not sticky */
      VAR(NOS, "st", ""),		/* Sticky dir (+t) but not other writable */
+     VAR(NOS, "rs", "0"),	/* Reset to normal color */
 +    VAR(NOS, "ca", ""),		/* file with capability */
  };
  

tcsh-6.15.00-rs-color.patch:
 tw.color.c |    1 +
 1 file changed, 1 insertion(+)

Index: tcsh-6.15.00-rs-color.patch
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh-6.15.00-rs-color.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tcsh-6.15.00-rs-color.patch	2 Mar 2009 14:11:52 -0000	1.1
+++ tcsh-6.15.00-rs-color.patch	20 Jul 2009 13:25:46 -0000	1.2
@@ -1,10 +1,10 @@
---- tcsh-6.15.00/tw.color.c.rs	2009-02-27 16:03:44.000000000 -0500
-+++ tcsh-6.15.00/tw.color.c	2009-02-27 16:05:57.000000000 -0500
-@@ -86,6 +86,8 @@ static Variable variables[] = {
-     VAR(NOS, "ow", ""),		/* Other writable dir (o+w) but not sticky */
+diff -up tcsh-6.17.00/tw.color.c_old tcsh-6.17.00/tw.color.c
+--- tcsh-6.17.00/tw.color.c_old	2009-07-20 15:14:22.000000000 +0200
++++ tcsh-6.17.00/tw.color.c	2009-07-20 15:15:26.000000000 +0200
+@@ -87,6 +87,7 @@ static Variable variables[] = {
      VAR(NOS, "st", ""),		/* Sticky dir (+t) but not other writable */
+     VAR(NOS, "rs", "0"),	/* Reset to normal color */
      VAR(NOS, "ca", ""),		/* file with capability */
-+    VAR(NOS, "rs", ""),         /* RESET */
 +    VAR(NOS, "hl", ""),		/* Hardlink */
  };
  


Index: tcsh.spec
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- tcsh.spec	30 Apr 2009 11:38:58 -0000	1.62
+++ tcsh.spec	20 Jul 2009 13:25:46 -0000	1.63
@@ -2,7 +2,7 @@
 
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
-Version: 6.16
+Version: 6.17
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Shells
@@ -16,8 +16,7 @@ Patch7: tcsh-6.14.00-set.patch
 Patch8: tcsh-6.14.00-syntax.patch
 Patch9: tcsh-6.13.00-memoryuse.patch
 Patch11: tcsh-6.14.00-order.patch
-Patch12: tcsh-6.15.00-wide-str.patch
-Patch13: tcsh-6.15.00-rs-color.patch
+Patch12: tcsh-6.15.00-rs-color.patch
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -44,8 +43,7 @@ like syntax.
 %patch8 -p1 -b .syntax
 %patch9 -p1 -b .memoryuse
 %patch11 -p1 -b .order
-%patch12 -p1 -b .wide-str
-%patch13 -p1 -b .rs-color
+%patch12 -p1 -b .rs-color
 
 for i in Fixes WishList; do
  iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -119,6 +117,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Jul 20 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.17-1
+- Update to tcsh-6.17.00
+
 * Thu Apr 30 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.16-1
 - Update to tcsh-6.16.00
 - Merge Review (fix License, add BUGS and WishList to documentation, convert Fixes and


--- tcsh-6.15.00-wide-str.patch DELETED ---