diff --git a/.gitignore b/.gitignore index 5426c7c..885e523 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -ncurses-5.7.tar.gz -ncurses-5.7-20100424-patch.sh.bz2 -ncurses-5.7-20100501-20100703.patch.bz2 -ncurses-5.7-20100717-20101128.patch.bz2 -ncurses-5.7-20101204-20101211.patch.bz2 +/ncurses-5.8.tar.gz diff --git a/ncurses-5.7-20100703-config.patch b/ncurses-config.patch similarity index 100% rename from ncurses-5.7-20100703-config.patch rename to ncurses-config.patch diff --git a/ncurses-5.7-20101211-kbs.patch b/ncurses-kbs.patch similarity index 76% rename from ncurses-5.7-20101211-kbs.patch rename to ncurses-kbs.patch index 0954e27..b0860c6 100644 --- a/ncurses-5.7-20101211-kbs.patch +++ b/ncurses-kbs.patch @@ -1,7 +1,7 @@ -diff -up ncurses-5.7/misc/terminfo.src.kbs ncurses-5.7/misc/terminfo.src ---- ncurses-5.7/misc/terminfo.src.kbs 2010-12-13 17:39:01.721154908 +0100 -+++ ncurses-5.7/misc/terminfo.src 2010-12-13 17:40:14.982043936 +0100 -@@ -3272,6 +3272,7 @@ xterm-xfree86|xterm terminal emulator (X +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 # This version reflects the current xterm features. xterm-new|modern xterm terminal emulator, npc, @@ -9,7 +9,7 @@ diff -up ncurses-5.7/misc/terminfo.src.kbs ncurses-5.7/misc/terminfo.src 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, -@@ -4054,6 +4055,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -4061,6 +4062,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.7/misc/terminfo.src.kbs ncurses-5.7/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, -@@ -4064,7 +4066,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -4071,7 +4073,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,15 +26,15 @@ diff -up ncurses-5.7/misc/terminfo.src.kbs ncurses-5.7/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, -@@ -4834,6 +4836,7 @@ eterm-color|Emacs term.el terminal emula +@@ -4841,6 +4843,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, + colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1, + kbs=\177, 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, -@@ -4843,7 +4846,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -4850,7 +4853,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.7/misc/terminfo.src.kbs ncurses-5.7/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, -@@ -4949,6 +4952,7 @@ screen.xterm-r6|screen customized for X1 +@@ -4956,6 +4959,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-5.6-20070612-libs.patch b/ncurses-libs.patch similarity index 100% rename from ncurses-5.6-20070612-libs.patch rename to ncurses-libs.patch diff --git a/ncurses-5.7-20100703-urxvt.patch b/ncurses-urxvt.patch similarity index 100% rename from ncurses-5.7-20100703-urxvt.patch rename to ncurses-urxvt.patch diff --git a/ncurses.spec b/ncurses.spec index e17894d..883b67b 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,21 +1,16 @@ Summary: Ncurses support utilities Name: ncurses -Version: 5.7 -Release: 11.20101211%{?dist} +Version: 5.8 +Release: 1%{?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.7-20100424-patch.sh.bz2 -Patch2: ncurses-5.7-20100501-20100703.patch.bz2 -Patch3: ncurses-5.7-20100717-20101128.patch.bz2 -Patch4: ncurses-5.7-20101204-20101211.patch.bz2 - -Patch8: ncurses-5.7-20100703-config.patch -Patch9: ncurses-5.6-20070612-libs.patch -Patch11: ncurses-5.7-20100703-urxvt.patch -Patch12: ncurses-5.7-20101211-kbs.patch +Patch8: ncurses-config.patch +Patch9: ncurses-libs.patch +Patch11: ncurses-urxvt.patch +Patch12: ncurses-kbs.patch BuildRequires: gpm-devel pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -94,11 +89,6 @@ The ncurses-static package includes static libraries of the ncurses library. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 - %patch8 -p1 -b .config %patch9 -p1 -b .libs %patch11 -p1 -b .urxvt @@ -282,6 +272,9 @@ bzip2 NEWS rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Mar 02 2011 Miroslav Lichvar 5.8-1 +- update to 5.8 + * Tue Feb 08 2011 Fedora Release Engineering - 5.7-11.20101211 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 2274a4c..90ea14c 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -cce05daf61a64501ef6cd8da1f727ec6 ncurses-5.7.tar.gz -3a5f76613f0f7ec3e0e73b835bc24864 ncurses-5.7-20100424-patch.sh.bz2 -4b0c5f399843304e8cabcab1ec6012cf ncurses-5.7-20100501-20100703.patch.bz2 -d182f8f9aafc9bd180c7340a4189dc7b ncurses-5.7-20100717-20101128.patch.bz2 -28d7a82e1e539eb253d63473f088a594 ncurses-5.7-20101204-20101211.patch.bz2 +20ed3fa7599937f0ca268d9088837a64 ncurses-5.8.tar.gz