From 059f7f954d95d87cc3dc1c881fc86e6c597db016 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 18 Jul 2011 16:42:26 +0200
Subject: [PATCH] update to patch 20110716

---
 .gitignore           |  1 +
 ncurses-config.patch | 29 ++++++++++++++---------------
 ncurses-kbs.patch    | 24 ++++++++++++------------
 ncurses.spec         |  5 ++++-
 sources              |  1 +
 5 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index f6c7988..14afdb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ncurses-5.9.tar.gz
+/ncurses-5.9-20110409-20110716.patch.bz2
diff --git a/ncurses-config.patch b/ncurses-config.patch
index 966ab9d..731785f 100644
--- a/ncurses-config.patch
+++ b/ncurses-config.patch
@@ -1,6 +1,6 @@
-diff -up ncurses-5.7/misc/ncurses-config.in.config ncurses-5.7/misc/ncurses-config.in
---- ncurses-5.7/misc/ncurses-config.in.config	2010-07-13 16:55:47.000000000 +0200
-+++ ncurses-5.7/misc/ncurses-config.in	2010-07-13 16:59:07.000000000 +0200
+diff -up ncurses-5.9/misc/ncurses-config.in.config ncurses-5.9/misc/ncurses-config.in
+--- ncurses-5.9/misc/ncurses-config.in.config	2011-07-18 15:58:01.606366364 +0200
++++ ncurses-5.9/misc/ncurses-config.in	2011-07-18 16:06:32.572122421 +0200
 @@ -35,7 +35,6 @@ exec_prefix="@exec_prefix@"
  
  bindir="@bindir@"
@@ -9,21 +9,20 @@ diff -up ncurses-5.7/misc/ncurses-config.in.config ncurses-5.7/misc/ncurses-conf
  datadir="@datadir@"
  mandir="@mandir@"
  
-@@ -85,11 +84,11 @@ ENDECHO
+@@ -83,12 +82,7 @@ while test $# -gt 0; do
+ ENDECHO
+ 		;;
  	--libs)
+-		if test "$libdir" = /usr/lib
+-		then
+ 			LIBDIR=
+-		else
+-			LIBDIR=-L$libdir
+-		fi
  		if test @TINFO_NAME@ = @LIB_NAME@ ; then
  		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--			-L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
-+			@EXTRA_LDFLAGS@ -l${THIS} @LIBS@
- ENDECHO
- 		else
- 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
--			-L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
-+			@EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
- ENDECHO
- 		fi
- 		;;
-@@ -114,7 +113,6 @@ ENDECHO
+ 			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+@@ -120,7 +114,6 @@ ENDECHO
  		echo "${includedir}"
  		;;
  	--libdir)
diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch
index b0860c6..68073a2 100644
--- a/ncurses-kbs.patch
+++ b/ncurses-kbs.patch
@@ -1,15 +1,15 @@
-diff -up ncurses-5.8/misc/terminfo.src.kbs ncurses-5.8/misc/terminfo.src
---- ncurses-5.8/misc/terminfo.src.kbs	2011-03-02 16:56:03.132403003 +0100
-+++ ncurses-5.8/misc/terminfo.src	2011-03-02 16:57:24.407886582 +0100
-@@ -3274,6 +3274,7 @@ xterm-xfree86|xterm terminal emulator (X
+diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src
+--- ncurses-5.9/misc/terminfo.src.kbs	2011-07-18 16:07:06.202072897 +0200
++++ ncurses-5.9/misc/terminfo.src	2011-07-18 16:08:04.893153591 +0200
+@@ -3290,6 +3290,7 @@ xterm-xfree86|xterm terminal emulator (X
  # This version reflects the current xterm features.
  xterm-new|modern xterm terminal emulator,
  	npc,
 +	kbs=\177,
- 	indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
- 	kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE,
- 	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-@@ -4061,6 +4062,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
+ 	indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
+ 	rin=\E[%p1%dT, use=xterm+pcfkeys, use=xterm+tmux,
+ 	use=xterm-basic,
+@@ -4096,6 +4097,7 @@ mlterm-256color|mlterm 3.0 with xterm 25
  rxvt-basic|rxvt terminal base (X Window System),
  	OTbs, am, bce, eo, mir, msgr, xenl, xon, XT,
  	cols#80, it#8, lines#24,
@@ -17,7 +17,7 @@ diff -up ncurses-5.8/misc/terminfo.src.kbs ncurses-5.8/misc/terminfo.src
  	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
  	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
  	clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
-@@ -4071,7 +4073,7 @@ rxvt-basic|rxvt terminal base (X Window 
+@@ -4106,7 +4108,7 @@ rxvt-basic|rxvt terminal base (X Window 
  	enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ht=^I,
  	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
  	ind=^J, is1=\E[?47l\E=\E[?1l,
@@ -26,7 +26,7 @@ diff -up ncurses-5.8/misc/terminfo.src.kbs ncurses-5.8/misc/terminfo.src
  	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
  	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
  	rmul=\E[24m,
-@@ -4841,6 +4843,7 @@ eterm-color|Emacs term.el terminal emula
+@@ -4876,6 +4878,7 @@ eterm-color|Emacs term.el terminal emula
  screen|VT 100/ANSI X3.64 virtual terminal,
  	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
  	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1,
@@ -34,7 +34,7 @@ diff -up ncurses-5.8/misc/terminfo.src.kbs ncurses-5.8/misc/terminfo.src
  	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
  	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
  	clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M,
-@@ -4850,7 +4853,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -4885,7 +4888,7 @@ screen|VT 100/ANSI X3.64 virtual termina
  	cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
  	dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
  	flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
@@ -43,7 +43,7 @@ diff -up ncurses-5.8/misc/terminfo.src.kbs ncurses-5.8/misc/terminfo.src
  	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
  	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
  	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-@@ -4956,6 +4959,7 @@ screen.xterm-r6|screen customized for X1
+@@ -4991,6 +4994,7 @@ screen.xterm-r6|screen customized for X1
  # on Solaris because Sun's curses implementation gets confused.
  screen.teraterm|disable ncv in teraterm,
  	ncv#127,
diff --git a/ncurses.spec b/ncurses.spec
index e7e921a..9c39134 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,12 +1,13 @@
 Summary: Ncurses support utilities
 Name: ncurses
 Version: 5.9
-Release: 1%{?dist}
+Release: 2.20110716%{?dist}
 License: MIT
 Group: System Environment/Base
 URL: http://invisible-island.net/ncurses/ncurses.html
 Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
 
+Patch1: ncurses-5.9-20110409-20110716.patch.bz2
 Patch8: ncurses-config.patch
 Patch9: ncurses-libs.patch
 Patch11: ncurses-urxvt.patch
@@ -89,6 +90,8 @@ The ncurses-static package includes static libraries of the ncurses library.
 %prep
 %setup -q
 
+%patch1 -p1
+
 %patch8 -p1 -b .config
 %patch9 -p1 -b .libs
 %patch11 -p1 -b .urxvt
diff --git a/sources b/sources
index 5341ee2..dac372c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 8cb9c412e5f2d96bc6f459aa8c6282a1  ncurses-5.9.tar.gz
+68d3169181b0e526f16367a6d5333a39  ncurses-5.9-20110409-20110716.patch.bz2