rpms/ncurses/devel ncurses-5.7-20100703-config.patch, NONE, 1.1 ncurses-5.7-20100703-urxvt.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 ncurses.spec, 1.96, 1.97 sources, 1.36, 1.37 ncurses-5.6-20080112-urxvt.patch, 1.1, NONE ncurses-5.7-20100116-config.patch, 1.2, NONE

Miroslav Lichvar mlichvar at fedoraproject.org
Wed Jul 14 15:01:27 UTC 2010


Author: mlichvar

Update of /cvs/pkgs/rpms/ncurses/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18809

Modified Files:
	.cvsignore ncurses.spec sources 
Added Files:
	ncurses-5.7-20100703-config.patch 
	ncurses-5.7-20100703-urxvt.patch 
Removed Files:
	ncurses-5.6-20080112-urxvt.patch 
	ncurses-5.7-20100116-config.patch 
Log Message:
- update to patch 20100703
- add README to base subpackage


ncurses-5.7-20100703-config.patch:
 ncurses-config.in |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE ncurses-5.7-20100703-config.patch ---
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
@@ -35,7 +35,6 @@ exec_prefix="@exec_prefix@"
 
 bindir="@bindir@"
 includedir="@includedir@"
-libdir="@libdir@"
 datadir="@datadir@"
 mandir="@mandir@"
 
@@ -85,11 +84,11 @@ ENDECHO
 	--libs)
 		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
 		echo "${includedir}"
 		;;
 	--libdir)
-		echo "${libdir}"
 		;;
 	--mandir)
 		echo "${mandir}"

ncurses-5.7-20100703-urxvt.patch:
 terminfo.src |  166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 166 insertions(+)

--- NEW FILE ncurses-5.7-20100703-urxvt.patch ---
diff -up ncurses-5.7/misc/terminfo.src.urxvt ncurses-5.7/misc/terminfo.src
--- ncurses-5.7/misc/terminfo.src.urxvt	2010-07-13 17:32:48.000000000 +0200
+++ ncurses-5.7/misc/terminfo.src	2010-07-13 17:32:48.000000000 +0200
@@ -4184,6 +4184,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 at clark.net> 04 Oct 1997
+# Updated: Özgür Kesim <kesim at math.fu-berlin.de> 02 Nov 1997
+# Updated: Marc Lehmann <pcg at 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.4
 #
 # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncurses/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- .cvsignore	3 Feb 2010 17:56:37 -0000	1.36
+++ .cvsignore	14 Jul 2010 15:01:26 -0000	1.37
@@ -1,3 +1,3 @@
 ncurses-5.7.tar.gz
-ncurses-5.7-20091107-patch.sh.bz2
-ncurses-5.7-20091114-20100130.patch.bz2
+ncurses-5.7-20100424-patch.sh.bz2
+ncurses-5.7-20100501-20100703.patch.bz2


Index: ncurses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncurses/devel/ncurses.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ncurses.spec	3 Feb 2010 17:56:37 -0000	1.96
+++ ncurses.spec	14 Jul 2010 15:01:26 -0000	1.97
@@ -1,22 +1,24 @@
 Summary: Ncurses support utilities
 Name: ncurses
 Version: 5.7
-Release: 7.20100130%{?dist}
+Release: 8.20100703%{?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-20091107-patch.sh.bz2
-Patch2: ncurses-5.7-20091114-20100130.patch.bz2
+Patch1: ncurses-5.7-20100424-patch.sh.bz2
+Patch2: ncurses-5.7-20100501-20100703.patch.bz2
 
-Patch8: ncurses-5.7-20100116-config.patch
+Patch8: ncurses-5.7-20100703-config.patch
 Patch9: ncurses-5.6-20070612-libs.patch
-Patch11: ncurses-5.6-20080112-urxvt.patch
+Patch11: ncurses-5.7-20100703-urxvt.patch
 Patch12: ncurses-5.6-20080628-kbs.patch
 BuildRequires: gpm-devel pkgconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 The curses library routines are a terminal-independent method of
 updating character screens with reasonable optimization.  The ncurses
@@ -177,7 +179,7 @@ done
 for termname in \
     Eterm\* aterm bterm cons25 cygwin eterm\* gnome gnome-256color hurd jfbterm \
     konsole konsole-256color mach\* mlterm mrxvt nsterm putty\* pcansi \
-    rxvt rxvt-\* screen screen-\* screen.\* sun teraterm teraterm2.3 \
+    rxvt rxvt-\* screen screen-\*color screen.\* sun teraterm teraterm2.3 \
     vwmterm wsvt25\* xfce xterm xterm-\*
 do
     for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do
@@ -230,7 +232,7 @@ bzip2 NEWS
 %defattr(-,root,root)
 %doc ANNOUNCE AUTHORS NEWS.bz2 README TO-DO
 %{_bindir}/[cirt]*
-%{_mandir}/man1/*
+%{_mandir}/man1/[cirt]*
 %{_mandir}/man5/*
 %{_mandir}/man7/*
 
@@ -241,6 +243,7 @@ bzip2 NEWS
 
 %files base -f terms.base
 %defattr(-,root,root)
+%doc README
 %dir %{_sysconfdir}/terminfo
 %{rootdatadir}/terminfo
 %{_datadir}/tabset
@@ -264,6 +267,7 @@ bzip2 NEWS
 %{_includedir}/ncurses/*.h
 %{_includedir}/ncursesw/*.h
 %{_includedir}/*.h
+%{_mandir}/man1/ncurses*-config*
 %{_mandir}/man3/*
 
 %files static
@@ -274,6 +278,10 @@ bzip2 NEWS
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Wed Jul 14 2010 Miroslav Lichvar <mlichvar at redhat.com> 5.7-8.20100703
+- update to patch 20100703
+- add README to base subpackage
+
 * Wed Feb 03 2010 Miroslav Lichvar <mlichvar at redhat.com> 5.7-7.20100130
 - update to patch 20100130
 - fix ncursesw5-config and pc files to use correct tinfo


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncurses/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- sources	3 Feb 2010 17:56:37 -0000	1.36
+++ sources	14 Jul 2010 15:01:27 -0000	1.37
@@ -1,3 +1,3 @@
 cce05daf61a64501ef6cd8da1f727ec6  ncurses-5.7.tar.gz
-7c840a1fa324d4e971414ae647600fc9  ncurses-5.7-20091107-patch.sh.bz2
-65ceeb747e4ff5be824e8f32193a54e4  ncurses-5.7-20091114-20100130.patch.bz2
+3a5f76613f0f7ec3e0e73b835bc24864  ncurses-5.7-20100424-patch.sh.bz2
+4b0c5f399843304e8cabcab1ec6012cf  ncurses-5.7-20100501-20100703.patch.bz2


--- ncurses-5.6-20080112-urxvt.patch DELETED ---


--- ncurses-5.7-20100116-config.patch DELETED ---



More information about the scm-commits mailing list