From 68cfac7f55c48790219b2b3f789b2c0840b90047 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 13 May 2013 11:15:11 +0200 Subject: [PATCH] update to 20130511 --- .gitignore | 1 + ncurses-kbs.patch | 14 +++++++------- ncurses.spec | 4 +++- sources | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 421d7e4..434d395 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /ncurses-5.9.tar.gz /ncurses-5.9-20120616-patch.sh.bz2 /ncurses-5.9-20120622-20130413.patch.xz +/ncurses-5.9-20130427-20130511.patch.xz diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch index 2ae4378..fcb5423 100644 --- a/ncurses-kbs.patch +++ b/ncurses-kbs.patch @@ -1,7 +1,7 @@ diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src ---- ncurses-5.9/misc/terminfo.src.kbs 2012-10-15 16:37:52.560806161 +0200 -+++ ncurses-5.9/misc/terminfo.src 2012-10-15 18:40:59.698731800 +0200 -@@ -4304,7 +4304,7 @@ rxvt-basic|rxvt terminal base (X Window +--- ncurses-5.9/misc/terminfo.src.kbs 2013-05-13 11:17:28.074878157 +0200 ++++ ncurses-5.9/misc/terminfo.src 2013-05-13 11:17:28.083878169 +0200 +@@ -4748,7 +4748,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, @@ -10,7 +10,7 @@ diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/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, -@@ -4314,7 +4314,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -4758,7 +4758,7 @@ rxvt-basic|rxvt terminal base (X Window sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq, @@ -19,7 +19,7 @@ diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5142,7 +5142,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -5590,7 +5590,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@, @@ -28,7 +28,7 @@ diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/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, -@@ -5154,7 +5154,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -5602,7 +5602,7 @@ screen|VT 100/ANSI X3.64 virtual termina sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, E0=\E(B, @@ -37,7 +37,7 @@ diff -up ncurses-5.9/misc/terminfo.src.kbs ncurses-5.9/misc/terminfo.src # The bce and status-line entries are from screen 3.9.13 (and require some # changes to .screenrc). screen-bce|VT 100/ANSI X3.64 virtual terminal with bce, -@@ -5248,6 +5248,7 @@ screen.xterm-r6|screen customized for X1 +@@ -5696,6 +5696,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 4e6b3dd..6b0c088 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,7 +1,7 @@ Summary: Ncurses support utilities Name: ncurses Version: 5.9 -Release: 10.20130413%{?dist} +Release: 10.20130511%{?dist} License: MIT Group: System Environment/Base URL: http://invisible-island.net/ncurses/ncurses.html @@ -9,6 +9,7 @@ Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz Patch1: ncurses-5.9-20120616-patch.sh.bz2 Patch2: ncurses-5.9-20120622-20130413.patch.xz +Patch3: ncurses-5.9-20130427-20130511.patch.xz Patch8: ncurses-config.patch Patch9: ncurses-libs.patch Patch10: ncurses-clear.patch @@ -97,6 +98,7 @@ The ncurses-static package includes static libraries of the ncurses library. %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch8 -p1 -b .config %patch9 -p1 -b .libs diff --git a/sources b/sources index feec3c4..b9455ec 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz f54bf02a349f96a7c4f0d00922f3a0d4 ncurses-5.9-20120616-patch.sh.bz2 763bf7e9db104a0aacd677bf4029ff73 ncurses-5.9-20120622-20130413.patch.xz +228daf29293b2b74cca01eebbfe82a88 ncurses-5.9-20130427-20130511.patch.xz