rpms/ncurses/devel ncurses-5.6-20080112-urxvt.patch, NONE, 1.1 ncurses-5.6-20080112-xterm.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 ncurses.spec, 1.80, 1.81 sources, 1.27, 1.28 ncurses-5.5-20061209-xterm.patch, 1.1, NONE ncurses-5.6-20070120-urxvt.patch, 1.1, NONE ncurses-5.6-20070812-comphash.patch, 1.1, NONE ncurses-5.6-20070812-fieldbuf.patch, 1.1, NONE ncurses-5.6-20070812-newfield.patch, 1.1, NONE ncurses-5.6-20070812-pad.patch, 1.1, NONE
Miroslav Lichvar (mlichvar)
fedora-extras-commits at redhat.com
Mon Jan 14 18:54:26 UTC 2008
- Previous message (by thread): rpms/nautilus/devel .cvsignore, 1.63, 1.64 nautilus.spec, 1.180, 1.181 sources, 1.67, 1.68
- Next message (by thread): rpms/firefox/devel .cvsignore, 1.41, 1.42 firefox-redhat-default-prefs.js, 1.12, 1.13 firefox.spec, 1.234, 1.235 sources, 1.49, 1.50 firefox-ssl-exception.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mlichvar
Update of /cvs/pkgs/rpms/ncurses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5506
Modified Files:
.cvsignore ncurses.spec sources
Added Files:
ncurses-5.6-20080112-urxvt.patch
ncurses-5.6-20080112-xterm.patch
Removed Files:
ncurses-5.5-20061209-xterm.patch
ncurses-5.6-20070120-urxvt.patch
ncurses-5.6-20070812-comphash.patch
ncurses-5.6-20070812-fieldbuf.patch
ncurses-5.6-20070812-newfield.patch
ncurses-5.6-20070812-pad.patch
Log Message:
- update to patch 20080112
- make -libs, -base, -term subpackages
- obsolete termcap and libtermcap
- update urxvt entry
ncurses-5.6-20080112-urxvt.patch:
--- NEW FILE ncurses-5.6-20080112-urxvt.patch ---
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 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.3
#
# mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
ncurses-5.6-20080112-xterm.patch:
--- NEW FILE ncurses-5.6-20080112-xterm.patch ---
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,
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncurses/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 13 Aug 2007 12:14:19 -0000 1.27
+++ .cvsignore 14 Jan 2008 18:53:50 -0000 1.28
@@ -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
Index: ncurses.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncurses/devel/ncurses.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ncurses.spec 16 Oct 2007 11:10:40 -0000 1.80
+++ ncurses.spec 14 Jan 2008 18:53:50 -0000 1.81
@@ -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 @@
(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 @@
%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 @@
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 @@
$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,23 +200,32 @@
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
+%{_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}/terminfo
%{_datadir}/tabset
-%{_bindir}/[cirt]*
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-%{_mandir}/man7/*
+%dir %{_datadir}/terminfo
+
+%files term -f terms.term
+%defattr(-,root,root)
%files devel
%defattr(-,root,root)
@@ -192,6 +257,12 @@
rm -rf ${RPM_BUILD_ROOT}
%changelog
+* Mon Jan 14 2008 Miroslav Lichvar <mlichvar at 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 at redhat.com> 5.6-12.20070812
- allocate additional working buffers in new_field (#310071)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncurses/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources 13 Aug 2007 12:14:19 -0000 1.27
+++ sources 14 Jan 2008 18:53:50 -0000 1.28
@@ -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
--- ncurses-5.5-20061209-xterm.patch DELETED ---
--- ncurses-5.6-20070120-urxvt.patch DELETED ---
--- ncurses-5.6-20070812-comphash.patch DELETED ---
--- ncurses-5.6-20070812-fieldbuf.patch DELETED ---
--- ncurses-5.6-20070812-newfield.patch DELETED ---
--- ncurses-5.6-20070812-pad.patch DELETED ---
- Previous message (by thread): rpms/nautilus/devel .cvsignore, 1.63, 1.64 nautilus.spec, 1.180, 1.181 sources, 1.67, 1.68
- Next message (by thread): rpms/firefox/devel .cvsignore, 1.41, 1.42 firefox-redhat-default-prefs.js, 1.12, 1.13 firefox.spec, 1.234, 1.235 sources, 1.49, 1.50 firefox-ssl-exception.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list