From 298b99962cc6292de384893b48da1849f59dc9a81ff59e4b5f2d1e87de4b0621 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 16 Nov 2011 11:14:31 +0000 Subject: [PATCH 1/2] . OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=27 --- tcsh-6.17.02.dif | 22 ++++++++++++++++++++++ tcsh.changes | 6 ++++++ tcsh.spec | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/tcsh-6.17.02.dif b/tcsh-6.17.02.dif index 787aa4e..b224efe 100644 --- a/tcsh-6.17.02.dif +++ b/tcsh-6.17.02.dif @@ -160,6 +160,28 @@ # ifndef __GNUC__ # define RCSID(id) static char *rcsid = (id); # else +--- configure ++++ configure 2011-11-16 10:49:20.387146641 +0000 +@@ -3750,7 +3750,7 @@ return tgetent (); + return 0; + } + _ACEOF +-for ac_lib in '' termlib termcap curses ncurses; do ++for ac_lib in '' termlib termcap tinfo curses ncurses; do + if test -z "$ac_lib"; then + ac_res="none required" + else +--- configure.in ++++ configure.in 2011-11-16 10:49:08.663146282 +0000 +@@ -296,7 +296,7 @@ fi + dnl Checks for libraries + AC_SEARCH_LIBS(crypt, crypt) + AC_SEARCH_LIBS(getspnam, sec) +-AC_SEARCH_LIBS(tgetent, termlib termcap curses ncurses) ++AC_SEARCH_LIBS(tgetent, termlib termcap tinfo curses ncurses) + AC_SEARCH_LIBS(gethostbyname, nsl) + AC_SEARCH_LIBS(connect, socket) + AC_SEARCH_LIBS(catgets, catgets) --- glob.h +++ glob.h 2006-04-25 12:58:31.000000000 +0000 @@ -72,6 +72,7 @@ typedef struct { diff --git a/tcsh.changes b/tcsh.changes index 3396339..0e8e81d 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 16 11:12:23 UTC 2011 - werner@suse.de + +- Use libtinfo if available otherwise libncurses (required due + bnc #729226) + ------------------------------------------------------------------- Mon Feb 28 14:59:52 CET 2011 - werner@suse.de diff --git a/tcsh.spec b/tcsh.spec index 7bc4aae..9089179 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -26,7 +26,7 @@ Group: System/Shells Requires: gawk textutils AutoReqProv: on Version: 6.17.02 -Release: 2 +Release: 11 Summary: The C SHell Source: ftp.astron.com:/pub/tcsh/tcsh-6.17.02.tar.bz2 Source1: nls-iconv From 02ddb26d49899bd2116df37852a5935cdbcacb2fdd08c32b6d6f63004d694ef2 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 16 Nov 2011 11:31:48 +0000 Subject: [PATCH 2/2] . OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=28 --- tcsh-6.17.02.dif | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/tcsh-6.17.02.dif b/tcsh-6.17.02.dif index b224efe..0f18015 100644 --- a/tcsh-6.17.02.dif +++ b/tcsh-6.17.02.dif @@ -1,12 +1,3 @@ ---- .pkgextract -+++ .pkgextract 2006-04-25 12:58:31.000000000 +0000 -@@ -0,0 +1,6 @@ -+patch -p0 -s --suffix=.spell < ../tcsh-6.15.00-spelling.dif -+patch -p0 -s --suffix=.utf8 < ../tcsh-6.15.00-utf8.dif -+patch -p0 -s --suffix=.pipe < ../tcsh-6.15.00-pipe.dif -+patch -p0 -s --suffix=.longjmp < ../tcsh-6.15.00-longjmp.dif -+patch -p0 -s --suffix=.normcmd < ../tcsh-6.15.00-norm-cmd.dif -+patch -p0 -s --suffix=.history < ../tcsh-6.15.00-history.dif --- Makefile.in +++ Makefile.in 2006-04-25 12:58:31.000000000 +0000 @@ -591,12 +591,12 @@ vgrind: @@ -161,8 +152,8 @@ # define RCSID(id) static char *rcsid = (id); # else --- configure -+++ configure 2011-11-16 10:49:20.387146641 +0000 -@@ -3750,7 +3750,7 @@ return tgetent (); ++++ configure 2011-11-16 10:49:20.000000000 +0000 +@@ -3654,7 +3654,7 @@ return tgetent (); return 0; } _ACEOF @@ -172,8 +163,8 @@ ac_res="none required" else --- configure.in -+++ configure.in 2011-11-16 10:49:08.663146282 +0000 -@@ -296,7 +296,7 @@ fi ++++ configure.in 2011-11-16 10:49:09.000000000 +0000 +@@ -281,7 +281,7 @@ fi dnl Checks for libraries AC_SEARCH_LIBS(crypt, crypt) AC_SEARCH_LIBS(getspnam, sec) @@ -181,7 +172,7 @@ +AC_SEARCH_LIBS(tgetent, termlib termcap tinfo curses ncurses) AC_SEARCH_LIBS(gethostbyname, nsl) AC_SEARCH_LIBS(connect, socket) - AC_SEARCH_LIBS(catgets, catgets) + AM_ICONV --- glob.h +++ glob.h 2006-04-25 12:58:31.000000000 +0000 @@ -72,6 +72,7 @@ typedef struct {