rpms/ncurses
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to patch 20080112

Browse Source 
- make -libs, -base, -term subpackages
- obsolete termcap and libtermcap
- update urxvt entry
This commit is contained in:
Miroslav Lichvar 2008-01-14 18:53:50 +00:00
parent 7f075bf30d
commit 3157c16001
11 changed files with 299 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,3 +1,3 @@
ncurses-5.6.tar.gz
ncurses-5.6-20070714-patch.sh.bz2
ncurses-5.6-20070714-20070812.patch.bz2
ncurses-5.6-20071201-patch.sh.bz2
ncurses-5.6-20071215-20080112.patch.bz2

20
ncurses-5.5-20061209-xterm.patch
View File

@ -1,20 +0,0 @@
--- ncurses-5.5/misc/terminfo.src.xterm 2006-12-11 15:13:42.000000000 +0100
+++ ncurses-5.5/misc/terminfo.src 2006-12-11 15:19:53.000000000 +0100
@@ -3018,7 +3018,7 @@
kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~,
kRIT=\E[1;2C, kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, kent=\EOM, khome=\EOH,
- kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
+ kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~, kbs=\177,
kpp=\E[5~, kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys,
use=xterm-basic,
#
@@ -3038,7 +3038,7 @@
# The meta key may also be used as a modifier in this scheme, adding another
# bit to the parameter.
xterm+pcfkeys|fragment for PC-style fkeys,
- use=xterm+pcf2, use=xterm+pcc2,
+ use=xterm+pcf0, use=xterm+pcc2,
#
# The "PC-style" modifier scheme was introduced in xterm patch #94 (1999/3/27)
# and revised in patch #167 (2002/8/24). Some other terminal emulators copied

78
ncurses-5.6-20070120-urxvt.patch
View File

@ -1,78 +0,0 @@
--- ncurses-5.6/misc/terminfo.src.urxvt 2007-01-21 10:56:35.000000000 +0100
+++ ncurses-5.6/misc/terminfo.src 2007-01-21 10:58:49.000000000 +0100
@@ -3747,6 +3747,75 @@
rxvt-16color|xterm with 16 colors like aixterm,
ncv#32, use=ibm+16color, use=rxvt,
+# rxvt-unicode
+# http://cvs.schmorp.de/rxvt-unicode/doc/etc/rxvt-unicode.terminfo?rev=1.15
+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
+# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
+# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005
+# Notes:
+# It has an AIX extension
+# box2=lqkxjmwuvtn,
+# but the latter does not work correctly.
+#
+rxvt-unicode|rxvt-unicode terminal (X Window System),
+ am, bce, eo, km, msgr, xenl, hs,
+ cols#80, it#8, lines#24,
+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
+ bel=^G, blink=\E[5m, bold=\E[1m, blink=\E[5m, civis=\E[?25l,
+ clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
+ csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+ dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
+ flash=\E[?5h$<20/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, 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,
+ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+ kDC=\E[3$, kIC=\E2$, kEND=\E[8$, kHOM=\E[7$, kLFT=\E[d, kNXT=\E[6$,
+ kPRV=\E[5$, kRIT=\E[c,
+ kbs=\177,
+ ka1=\EOw, ka3=\EOy,
+ kb2=\EOu,
+ kc1=\EOq, kc3=\EOs,
+ kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
+ kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kel=\E[8\^,
+ kend=\E[8~, kent=\EOM, kf1=\E[11~, kf10=\E[21~,
+ kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+ kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
+ kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf3=\E[13~,
+ kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+ kf9=\E[20~, kfnd=\E[1~, khome=\E[7~, kich1=\E[2~,
+ kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, rc=\E8,
+ rev=\E[7m, ri=\EM,
+ rmso=\E[27m, rmul=\E[24m,
+ rs1=\Ec,
+ rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>,
+ sgr0=\E[m\017,
+ enacs=, smacs=\E(0, rmacs=\E(B,
+ smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ vpa=\E[%i%p1%dd,
+ colors#88, pairs#256, btns#5, lm#0,
+ ccc, eo, npc, mc5i, ncv#0, mir, xon, bw,
+ ech=\E[%p1%dX,
+ mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
+ sitm=\E[3m, ritm=\E[23m,
+ smam=\E[?7h, rmam=\E[?7l,
+ smir=\E[4h, rmir=\E[4l,
+ smcup=\E[?1049h, rmcup=\E[r\E[?1049l,
+ smkx=\E[?1h\E=, rmkx=\E[?1l\E>,
+ indn=\E[%p1%dS, rin=\E[%p1%dT,
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+ op=\E[39;49m,
+ setaf=\E[38;5;%p1%dm, setab=\E[48;5;%p1%dm,
+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
+ sc=\E7,
+ s0ds=\E(B, s1ds=\E(0, s2ds=\E*B, s3ds=\E+B,
+ u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
+ tsl=\E]2;, fsl=\007, dsl=\E]2;\007,
+
# From: Michael Jennings <mej@valinux.com>
#
# Eterm 0.9.3

35
ncurses-5.6-20070812-comphash.patch
View File

@ -1,35 +0,0 @@
Index: ncurses/tinfo/comp_hash.c
Prereq: 1.32
--- ncurses-5.6-20070812+/ncurses/tinfo/comp_hash.c 2007-08-12 00:40:27.000000000 +0000
+++ ncurses-5.6-20070818/ncurses/tinfo/comp_hash.c 2007-08-18 21:42:25.000000000 +0000
@@ -50,7 +50,7 @@
#define DEBUG(level, params) /*nothing */
#endif
-MODULE_ID("$Id: comp_hash.c,v 1.32 2007/08/12 00:40:27 tom Exp $")
+MODULE_ID("$Id: comp_hash.c,v 1.33 2007/08/18 21:42:25 tom Exp $")
static int hash_function(const char *);
@@ -299,17 +299,17 @@
int len = 0;
int nxt;
- printf("static const char %s_names_text[] = \"\\\n", root_name);
+ printf("static const char %s_names_text[] = \\\n", root_name);
for (n = 0; n < CAPTABSIZE; n++) {
- nxt = strlen(name_table[n].nte_name) + 2;
+ nxt = strlen(name_table[n].nte_name) + 5;
if (nxt + len > 72) {
printf("\\\n");
len = 0;
}
- printf("%s\\0", name_table[n].nte_name);
+ printf("\"%s\\0\" ", name_table[n].nte_name);
len += nxt;
}
- printf("\";\n\n");
+ printf(";\n\n");
len = 0;
printf("static name_table_data const %s_names_data[] =\n",

12
ncurses-5.6-20070812-fieldbuf.patch
View File

@ -1,12 +0,0 @@
diff -up ncurses-5.6/form/frm_driver.c.fieldbuf ncurses-5.6/form/frm_driver.c
--- ncurses-5.6/form/frm_driver.c.fieldbuf 2007-10-09 12:35:24.000000000 +0200
+++ ncurses-5.6/form/frm_driver.c 2007-10-09 13:24:37.000000000 +0200
@@ -4476,7 +4476,7 @@ field_buffer(const FIELD *field, int buf
{
wclear(field->working);
mvwadd_wchnstr(field->working, 0, 0, data, size);
- mvwinnstr(field->working, 0, 0, result, (int)need + 1);
+ mvwinnstr(field->working, 0, 0, result, (int)need);
}
#else
result = Address_Of_Nth_Buffer(field, buffer);

12
ncurses-5.6-20070812-newfield.patch
View File

@ -1,12 +0,0 @@
diff -up ncurses-5.6/form/fld_def.c.newfield ncurses-5.6/form/fld_def.c
--- ncurses-5.6/form/fld_def.c.newfield 2007-10-12 14:23:46.000000000 +0200
+++ ncurses-5.6/form/fld_def.c 2007-10-12 14:26:03.000000000 +0200
@@ -305,7 +305,7 @@ new_field(int rows, int cols, int frow,
#if USE_WIDEC_SUPPORT
New_Field->working = newpad(1, Buffer_Length(New_Field) + 1);
- New_Field->expanded = (char **)calloc(1 + (unsigned)rows, sizeof(char *));
+ New_Field->expanded = (char **)calloc(1 + (unsigned)nbuf, sizeof(char *));
#endif
if (_nc_Copy_Type(New_Field, &default_field))

44
ncurses-5.6-20070812-pad.patch
View File

@ -1,44 +0,0 @@
diff -up ncurses-5.6/ncurses/tty/hashmap.c.pad ncurses-5.6/ncurses/tty/hashmap.c
--- ncurses-5.6/ncurses/tty/hashmap.c.pad 2007-10-04 10:08:40.000000000 +0200
+++ ncurses-5.6/ncurses/tty/hashmap.c 2007-10-04 10:08:40.000000000 +0200
@@ -131,8 +131,8 @@ update_cost(NCURSES_CH_T * from, NCURSES
int cost = 0;
int i;
- for (i = TEXTWIDTH; i > 0; i--)
- if (!(CharEq(*from++, *to++)))
+ for (i = TEXTWIDTH; i > 0; i--, from++, to++)
+ if (!(CharEq(*from, *to)))
cost++;
return cost;
@@ -148,8 +148,8 @@ update_cost_from_blank(NCURSES_CH_T * to
if (back_color_erase)
SetPair(blank, GetPair(stdscr->_nc_bkgd));
- for (i = TEXTWIDTH; i > 0; i--)
- if (!(CharEq(blank, *to++)))
+ for (i = TEXTWIDTH; i > 0; i--, to++)
+ if (!(CharEq(blank, *to)))
cost++;
return cost;
diff -up ncurses-5.6/ncurses/curses.priv.h.pad ncurses-5.6/ncurses/curses.priv.h
--- ncurses-5.6/ncurses/curses.priv.h.pad 2007-10-04 10:08:40.000000000 +0200
+++ ncurses-5.6/ncurses/curses.priv.h 2007-10-04 10:38:33.000000000 +0200
@@ -902,7 +902,14 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T)
#define SetAttr(c,a) AttrOf(c) = ((a) & A_ATTRIBUTES) | WidecExt(c)
#define NewChar2(c,a) { a, { c, NulChar } NulColor }
#define NewChar(ch) NewChar2(ChCharOf(ch), ChAttrOf(ch))
-#define CharEq(a,b) (!memcmp(&(a), &(b), sizeof(a)))
+#if CCHARW_MAX == 5
+#define CharEq(a,b) ((a).attr == (b).attr && (a).chars[0] == (b).chars[0] \
+ && (a).chars[1] == (b).chars[1] && (a).chars[2] == (b).chars[2] \
+ && (a).chars[3] == (b).chars[3] && (a).chars[4] == (b).chars[4] \
+ if_EXT_COLORS(&& (a).ext_color == (b).ext_color))
+#else
+#error CCHARW_MAX != 5
+#endif
#define SetChar(ch,c,a) do { \
NCURSES_CH_T *_cp = &ch; \
memset(_cp, 0, sizeof(ch)); \

176
ncurses-5.6-20080112-urxvt.patch Normal file
View File

@ -0,0 +1,176 @@
diff -up ncurses-5.6/misc/terminfo.src.urxvt ncurses-5.6/misc/terminfo.src
--- ncurses-5.6/misc/terminfo.src.urxvt 2008-01-10 14:09:13.000000000 +0100
+++ ncurses-5.6/misc/terminfo.src 2008-01-10 14:13:17.000000000 +0100
@@ -3882,6 +3882,172 @@ rxvt-cygwin-native|rxvt terminal emulato
rxvt-16color|xterm with 16 colors like aixterm,
ncv#32, use=ibm+16color, use=rxvt,
+# rxvt-unicode
+# http://cvs.schmorp.de/rxvt-unicode/doc/etc/rxvt-unicode.terminfo?revision=1.20
+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
+# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
+# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005
+rxvt-unicode|rxvt-unicode terminal (X Window System),
+ am,
+ bce,
+ eo,
+ km,
+ msgr,
+ xenl,
+ hs,
+ cols#80,
+ it#8,
+ lines#24,
+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
+ bel=^G,
+ blink=\E[5m,
+ bold=\E[1m,
+ civis=\E[?25l,
+ clear=\E[H\E[2J,
+ cnorm=\E[?25h,
+ cr=^M,
+ csr=\E[%i%p1%d;%p2%dr,
+ cub=\E[%p1%dD,
+ cub1=^H,
+ cud=\E[%p1%dB,
+ cud1=^J,
+ cuf=\E[%p1%dC,
+ cuf1=\E[C,
+ cup=\E[%i%p1%d;%p2%dH,
+ cuu=\E[%p1%dA,
+ cuu1=\E[A,
+ cvvis=\E[?25h,
+ dch=\E[%p1%dP,
+ dch1=\E[P,
+ dl=\E[%p1%dM,
+ dl1=\E[M,
+ ed=\E[J,
+ el=\E[K,
+ el1=\E[1K,
+ flash=\E[?5h$<20/>\E[?5l,
+ home=\E[H,
+ hpa=\E[%i%p1%dG,
+ 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,
+ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+ kDC=\E[3$,
+ kIC=\E2$,
+ kEND=\E[8$,
+ kHOM=\E[7$,
+ kLFT=\E[d,
+ kNXT=\E[6$,
+ kPRV=\E[5$,
+ kRIT=\E[c,
+ kbs=\177,
+ ka1=\EOw,
+ ka3=\EOy,
+ kb2=\EOu,
+ kc1=\EOq,
+ kc3=\EOs,
+ kcbt=\E[Z,
+ kcub1=\E[D,
+ kcud1=\E[B,
+ kcuf1=\E[C,
+ kcuu1=\E[A,
+ kdch1=\E[3~,
+ kel=\E[8\^,
+ kend=\E[8~,
+ kent=\EOM,
+ kf1=\E[11~,
+ kf10=\E[21~,
+ kf11=\E[23~,
+ kf12=\E[24~,
+ kf13=\E[25~,
+ kf14=\E[26~,
+ kf15=\E[28~,
+ kf16=\E[29~,
+ kf17=\E[31~,
+ kf18=\E[32~,
+ kf19=\E[33~,
+ kf2=\E[12~,
+ kf20=\E[34~,
+ kf3=\E[13~,
+ kf4=\E[14~,
+ kf5=\E[15~,
+ kf6=\E[17~,
+ kf7=\E[18~,
+ kf8=\E[19~,
+ kf9=\E[20~,
+ kfnd=\E[1~,
+ khome=\E[7~,
+ kich1=\E[2~,
+ kmous=\E[M,
+ knp=\E[6~,
+ kpp=\E[5~,
+ kslt=\E[4~,
+ rc=\E8,
+ rev=\E[7m,
+ ri=\EM,
+ rmso=\E[27m,
+ rmul=\E[24m,
+ rs1=\Ec,
+ rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>,
+ sgr0=\E[m\017,
+ enacs=,
+ smacs=\E(0,
+ rmacs=\E(B,
+ smso=\E[7m,
+ smul=\E[4m,
+ tbc=\E[3g,
+ vpa=\E[%i%p1%dd,
+ colors#88,
+ pairs#256,
+ btns#5,
+ lm#0,
+ ccc,
+ npc,
+ mc5i,
+ ncv#0,
+ mir,
+ xon,
+ bw,
+ ech=\E[%p1%dX,
+ mc0=\E[i,
+ mc4=\E[4i,
+ mc5=\E[5i,
+ sitm=\E[3m,
+ ritm=\E[23m,
+ smam=\E[?7h,
+ rmam=\E[?7l,
+ smir=\E[4h,
+ rmir=\E[4l,
+ smcup=\E[?1049h,
+ rmcup=\E[r\E[?1049l,
+ smkx=\E=,
+ rmkx=\E>,
+ indn=\E[%p1%dS,
+ rin=\E[%p1%dT,
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+ op=\E[39;49m,
+ setaf=\E[38;5;%p1%dm,
+ setab=\E[48;5;%p1%dm,
+ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
+ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
+ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
+ sc=\E7,
+ s0ds=\E(B,
+ s1ds=\E(0,
+ s2ds=\E*B,
+ s3ds=\E+B,
+ u6=\E[%i%d;%dR,
+ u7=\E[6n,
+ u8=\E[?1;2c,
+ u9=\E[c,
+ tsl=\E]2;,
+ fsl=\007,
+ dsl=\E]2;\007,
+
# mrxvt 0.5.3
#
# mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which

20
ncurses-5.6-20080112-xterm.patch Normal file
View File

@ -0,0 +1,20 @@
diff -up ncurses-5.6/misc/terminfo.src.xterm ncurses-5.6/misc/terminfo.src
--- ncurses-5.6/misc/terminfo.src.xterm 2008-01-10 16:59:01.000000000 +0100
+++ ncurses-5.6/misc/terminfo.src 2008-01-10 16:59:45.000000000 +0100
@@ -3023,6 +3023,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,
@@ -3046,7 +3047,7 @@ xterm-new|modern xterm terminal emulator
# The meta key may also be used as a modifier in this scheme, adding another
# bit to the parameter.
xterm+pcfkeys|fragment for PC-style fkeys,
- use=xterm+app, use=xterm+pcf2, use=xterm+pcc2,
+ use=xterm+app, use=xterm+pcf0, use=xterm+pcc2,
use=xterm+pce2,
#
xterm+noapp|fragment with cursor keys in normal mode,

127
ncurses.spec
View File

@ -1,23 +1,19 @@
Summary: A terminal handling library
Summary: Ncurses support utilities
Name: ncurses
Version: 5.6
Release: 12.20070812%{?dist}
Release: 13.20080112%{?dist}
License: MIT
Group: System Environment/Libraries
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.6-20070714-patch.sh.bz2
Patch2: ncurses-5.6-20070714-20070812.patch.bz2
Patch1: ncurses-5.6-20071201-patch.sh.bz2
Patch2: ncurses-5.6-20071215-20080112.patch.bz2
Patch8: ncurses-5.5-20061209-config.patch
Patch9: ncurses-5.6-20070612-libs.patch
Patch10: ncurses-5.5-20061209-xterm.patch
Patch11: ncurses-5.6-20070120-urxvt.patch
Patch12: ncurses-5.6-20070812-comphash.patch
Patch13: ncurses-5.6-20070812-pad.patch
Patch14: ncurses-5.6-20070812-fieldbuf.patch
Patch15: ncurses-5.6-20070812-newfield.patch
Patch10: ncurses-5.6-20080112-xterm.patch
Patch11: ncurses-5.6-20080112-urxvt.patch
BuildRequires: gpm-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -27,10 +23,51 @@ updating character screens with reasonable optimization. The ncurses
(new curses) library is a freely distributable replacement for the
discontinued 4.4 BSD classic curses library.
This package contains support utilities, including a terminfo compiler
tic, a decompiler infocmp, clear, tput, tset, and a termcap conversion
tool captoinfo.
%package libs
Summary: Ncurses libraries
Group: System Environment/Libraries
Requires: %{name}-base = %{version}-%{release}
# libs introduced in 5.6-13
Obsoletes: ncurses < 5.6-13
Conflicts: ncurses < 5.6-13
Obsoletes: libtermcap < 2.0.8-48
%description libs
The curses library routines are a terminal-independent method of
updating character screens with reasonable optimization. The ncurses
(new curses) library is a freely distributable replacement for the
discontinued 4.4 BSD classic curses library.
This package contains the ncurses libraries.
%package base
Summary: Descriptions of common terminals
Group: System Environment/Base
Obsoletes: termcap < 1:5.5-2
# base introduced in 5.6-13
Conflicts: ncurses < 5.6-13
%description base
This package contains descriptions of common terminals. Other terminal
descriptions are included in the ncurses-term package.
%package term
Summary: Terminal descriptions
Group: System Environment/Base
Requires: %{name}-base = %{version}-%{release}
%description term
This package contains additional terminal descriptions not found in
the ncurses-base package.
%package devel
Summary: Development files for the ncurses library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
%description devel
The header files and libraries for developing applications that use
@ -59,10 +96,6 @@ rm -rf tack
%patch9 -p1 -b .libs
%patch10 -p1 -b .xterm
%patch11 -p1 -b .urxvt
%patch12 -p1 -b .comphash
%patch13 -p1 -b .pad
%patch14 -p1 -b .fieldbuf
%patch15 -p1 -b .newfield
# this will be in documentation, drop executable bits
chmod 644 test/*
@ -111,13 +144,13 @@ done
mkdir -p $RPM_BUILD_ROOT{%{rootdatadir},%{_sysconfdir}}/terminfo
# move few basic terminfo entries to /lib
baseterms=""
baseterms=
for termname in \
ansi dumb linux vt100 vt100-nav vt220 xterm
ansi dumb linux vt100 vt100-nav vt102 vt220 vt52
do
linkedterms=$(find $RPM_BUILD_ROOT%{_datadir}/terminfo \
for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo \
-samefile $RPM_BUILD_ROOT%{_datadir}/terminfo/${termname::1}/$termname)
for t in $linkedterms; do
do
baseterms="$baseterms $(basename $t)"
done
done
@ -130,6 +163,29 @@ for termname in $baseterms; do
$RPM_BUILD_ROOT%{_datadir}/$termpath
done
# prepare -base and -term file lists
for termname in \
Eterm cons25 cygwin gnome* hurd jfbterm mach* mrxvt nsterm \
putty* pcansi rxvt rxvt-\* screen screen-\* screen.linux screen.xterm* \
sun teraterm wsvt25* xfce xterm xterm-\* xfce
do
for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do
for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do
baseterms="$baseterms $(basename $t)"
done
done
done 2> /dev/null
for t in $baseterms; do
echo "%dir %{_datadir}/terminfo/${t::1}"
echo %{_datadir}/terminfo/${t::1}/$t
done 2> /dev/null | sort -u > terms.base
find $RPM_BUILD_ROOT%{_datadir}/terminfo \! -type d | \
sed "s|^$RPM_BUILD_ROOT||" | while read t
do
echo "%dir $(dirname $t)"
echo $t
done 2> /dev/null | sort -u | comm -2 -3 - terms.base > terms.term
ln -sf ncurses/{curses,unctrl,eti,form,menu,ncurses,panel,term}.h \
${RPM_BUILD_ROOT}%{_includedir}
@ -144,24 +200,33 @@ echo "INPUT(-lncurses)" > $RPM_BUILD_ROOT%{_libdir}/libcurses.so
rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
%post -p /sbin/ldconfig
%post libs -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc ANNOUNCE AUTHORS README TO-DO
/%{_lib}/lib*.so.*
%{_libdir}/lib*.so.*
%dir %{_sysconfdir}/terminfo
%{rootdatadir}/terminfo
%{_datadir}/terminfo
%{_datadir}/tabset
%{_bindir}/[cirt]*
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man7/*
%files libs
%defattr(-,root,root)
/%{_lib}/lib*.so.*
%{_libdir}/lib*.so.*
%files base -f terms.base
%defattr(-,root,root)
%dir %{_sysconfdir}/terminfo
%{rootdatadir}/terminfo
%{_datadir}/tabset
%dir %{_datadir}/terminfo
%files term -f terms.term
%defattr(-,root,root)
%files devel
%defattr(-,root,root)
%doc test
@ -192,6 +257,12 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
rm -rf ${RPM_BUILD_ROOT}
%changelog
* Mon Jan 14 2008 Miroslav Lichvar <mlichvar@redhat.com> 5.6-13.20080112
- update to patch 20080112
- make -libs, -base, -term subpackages
- obsolete termcap and libtermcap
- update urxvt entry
* Tue Oct 16 2007 Miroslav Lichvar <mlichvar@redhat.com> 5.6-12.20070812
- allocate additional working buffers in new_field (#310071)

4
sources
View File

@ -1,3 +1,3 @@
b6593abe1089d6aab1551c105c9300e3 ncurses-5.6.tar.gz
538ee3ad54b446ad8e8e2fd593db7435 ncurses-5.6-20070714-patch.sh.bz2
7df5199209339dca1d9a8e349060434b ncurses-5.6-20070714-20070812.patch.bz2
5c4c833a31064c7099209f7a141fed10 ncurses-5.6-20071201-patch.sh.bz2
d32ba589cd7bfdc4ac82fd8078c06e2b ncurses-5.6-20071215-20080112.patch.bz2