summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojtech Vitek (V-Teq) <vvitek@redhat.com>2012-03-20 17:57:29 +0100
committerVojtech Vitek (V-Teq) <vvitek@redhat.com>2012-03-20 18:03:28 +0100
commit8b0e83d044fc754ac8e04b7026005a5ce5c0c860 (patch)
treee56852dd0f335842fd61fcd5b401215e57347732
parent6827526b9217cbdd7b0db2ce4d73c4a573045f27 (diff)
downloadtcsh-rebase-6.19.00-8b0e83d044fc754ac8e04b7026005a5ce5c0c860.tar.gz
tcsh-rebase-6.19.00-8b0e83d044fc754ac8e04b7026005a5ce5c0c860.tar.xz
tcsh-rebase-6.19.00-8b0e83d044fc754ac8e04b7026005a5ce5c0c860.zip
Update to tcsh-6.18.00 - adapt tcsh-6.14.00-tinfo.patch
-rw-r--r--tcsh-6.14.00-tinfo.patch23
-rw-r--r--tcsh.spec2
2 files changed, 19 insertions, 6 deletions
diff --git a/tcsh-6.14.00-tinfo.patch b/tcsh-6.14.00-tinfo.patch
index 3660e8b..6488f9f 100644
--- a/tcsh-6.14.00-tinfo.patch
+++ b/tcsh-6.14.00-tinfo.patch
@@ -1,7 +1,17 @@
-diff -up tcsh-6.15.00/configure.in.tinfo tcsh-6.15.00/configure.in
---- tcsh-6.15.00/configure.in.tinfo 2007-03-03 21:01:26.000000000 +0100
-+++ tcsh-6.15.00/configure.in 2008-08-29 12:27:47.000000000 +0200
-@@ -263,7 +263,7 @@ fi
+From 039673bc9e8f3f6b198d1fc68878324a63bd111a Mon Sep 17 00:00:00 2001
+From: "Vojtech Vitek (V-Teq)" <vvitek@redhat.com>
+Date: Thu, 15 Mar 2012 02:10:35 +0100
+Subject: [PATCH] Search for tinfo library instead of termcap/(n)curses etc.
+
+---
+ configure.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 103ab37..9a2afef 100644
+--- a/configure.in
++++ b/configure.in
+@@ -299,7 +299,7 @@ fi
dnl Checks for libraries
AC_SEARCH_LIBS(crypt, crypt)
AC_SEARCH_LIBS(getspnam, sec)
@@ -9,4 +19,7 @@ diff -up tcsh-6.15.00/configure.in.tinfo tcsh-6.15.00/configure.in
+AC_SEARCH_LIBS(tgetent, tinfo)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(connect, socket)
- AM_ICONV
+ AC_SEARCH_LIBS(catgets, catgets)
+--
+1.7.6.5
+
diff --git a/tcsh.spec b/tcsh.spec
index 29b853e..04a13e3 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -131,7 +131,7 @@ fi
tcsh-6.17.00-handle-signals-before-flush.patch
tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch (reverted!)
- Modify and adapt the existing patches to the new source code:
- tcsh-6.13.00-memoryuse.patch
+ tcsh-6.13.00-memoryuse.patch, tcsh-6.14.00-tinfo.patch,
* Thu Feb 16 2012 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 6.17-19
- Handle pending signals before flush so that the the .history file