- update to patch 20070120

- don't depend on bash, drop resetall script
- include rxvt-unicode description

.cvsignore

@@ -1,2 +1,2 @@
 ncurses-5.6.tar.gz
-ncurses-5.6-20061223-20070106.patch.bz2
+ncurses-5.6-20061223-20070120.patch.bz2

ncurses-5.6-20070120-urxvt.patch

@@ -0,0 +1,78 @@
+--- 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

ncurses.spec

@@ -1,20 +1,19 @@
 Summary: A terminal handling library
 Name: ncurses
 Version: 5.6
-Release: 1.20070106%{?dist}
+Release: 2.20070120%{?dist}
 License: distributable
 Group: System Environment/Libraries
 URL: http://invisible-island.net/ncurses/ncurses.html
 Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
-Source3: ncurses-resetall.sh
 
-Patch1: ncurses-5.6-20061223-20070106.patch.bz2
+Patch1: ncurses-5.6-20061223-20070120.patch.bz2
 
 Patch6: ncurses-5.5-20061209-tgetent.patch
-Patch7: ncurses-5.6-20070106-staticprogs.patch
 Patch8: ncurses-5.5-20061209-config.patch
 Patch9: ncurses-5.5-liblinks.patch
 Patch10: ncurses-5.5-20061209-xterm.patch
+Patch11: ncurses-5.6-20070120-urxvt.patch
 BuildRequires: gpm-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,10 +50,10 @@ Use the following compiler flags to build against the ncurses library:
 %patch1 -p1
 
 %patch6 -p1 -b .tgetent
-%patch7 -p1 -b .staticprogs
 %patch8 -p1 -b .config
 %patch9 -p1 -b .liblinks
 %patch10 -p1 -b .xterm
+%patch11 -p1 -b .urxvt
 
 %build
 %define rootdatadir /lib
@@ -65,35 +64,27 @@ Use the following compiler flags to build against the ncurses library:
     --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
     --includedir=%{_includedir}/ncursesw \\\
     --enable-overwrite \\\
-    --without-progs \\\
     --with-chtype=long
 
-mkdir narrowc widec staticprogs
+mkdir narrowc widec
 cd narrowc
 ln -s ../configure .
-%configure %{ncurses_options}
+%configure %{ncurses_options} --with-ticlib
 make %{?_smp_mflags} libs
+make %{?_smp_mflags} -C progs
+make %{?_smp_mflags} -C tack
 
 cd ../widec
 ln -s ../configure .
-%configure %{ncurses_options} --enable-widec
+%configure %{ncurses_options} --enable-widec --without-progs
 make %{?_smp_mflags} libs
-
-cd ../staticprogs
-ln -s ../configure .
-%configure %{ncurses_options} --with-progs
-make %{?_smp_mflags} libs
-cp -a ../narrowc/lib/libncurses.so* lib
-make %{?_smp_mflags} -C progs
-make %{?_smp_mflags} -C tack
 cd ..
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make -C narrowc install.libs
+make -C narrowc install.{libs,progs,tack,data}
 make -C widec install.{libs,includes,man}
-make -C staticprogs install.{progs,tack,data}
 
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
@@ -137,8 +128,6 @@ for l in $RPM_BUILD_ROOT%{_includedir}/ncursesw/*.h; do
     ln -s ../ncursesw/$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncurses
 done
 
-install -c -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_bindir}/resetall
-
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 
 %post -p /sbin/ldconfig
@@ -187,6 +176,11 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Sun Jan 21 2007 Miroslav Lichvar <mlichvar@redhat.com> 5.6-2.20070120
+- update to patch 20070120
+- don't depend on bash, drop resetall script
+- include rxvt-unicode description
+
 * Wed Jan 10 2007 Miroslav Lichvar <mlichvar@redhat.com> 5.6-1.20070106
 - update to 5.6, patch 20070106
 

sources

@@ -1,2 +1,2 @@
 b6593abe1089d6aab1551c105c9300e3  ncurses-5.6.tar.gz
-70d86f1dddf76c6f7cc8421c232cfa5f  ncurses-5.6-20061223-20070106.patch.bz2
+f66addc615259d75eaf2b7143246f516  ncurses-5.6-20061223-20070120.patch.bz2