- update to patch 20061209

- strip large tables from shared libraries, reduce number of relocations - package utils linked with libncurses instead of libncursesw - package only wide-character headers
2006-12-11 15:12:09 +00:00 · 2006-12-11 15:12:09 +00:00 · c27798dfe4
commit c27798dfe4
parent 0721f6fe17
6 changed files with 94 additions and 32 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,5 +1,3 @@
 ncurses-5.5.tar.gz
-ncurses-5.5-20060701.patch.gz
-patch-5.5-20060625.sh.gz
-ncurses-5.5-20060708.patch.gz
-ncurses-5.5-20060715.patch.gz
+ncurses-5.5-20060909-patch.sh.bz2
+ncurses-5.5-20060909-20061209.patch.bz2
--- a/ncurses-5.5-20061209-config.patch
+++ b/ncurses-5.5-20061209-config.patch
@ -0,0 +1,27 @@
+--- ncurses-5.5/misc/ncurses-config.in.config	2006-12-11 13:35:54.000000000 +0100
+++ ncurses-5.5/misc/ncurses-config.in	2006-12-11 13:40:02.000000000 +0100
+@@ -34,7 +34,6 @@
+ exec_prefix="@exec_prefix@"
+ 
+ bindir="@bindir@"
+-libdir="@libdir@"
+ datadir="@datadir@"
+ mandir="@mandir@"
+ 
+@@ -82,7 +81,7 @@
+ 		;;
+ 	--libs)
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+-			-L${exec_prefix}/lib @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+			@EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+ ENDECHO
+ 		;;
+ 	# identification
+@@ -103,7 +102,6 @@
+ 		echo "${datadir}"
+ 		;;
+ 	--libdir)
+-		echo "${libdir}"
+ 		;;
+ 	--mandir)
+ 		echo "${mandir}"
--- a/ncurses-5.5-20061209-tgetent.patch
+++ b/ncurses-5.5-20061209-tgetent.patch
@ -0,0 +1,10 @@
+--- ncurses-5.5/ncurses/tinfo/lib_termcap.c.tgetent	2006-12-07 13:07:03.000000000 +0100
+++ ncurses-5.5/ncurses/tinfo/lib_termcap.c	2006-12-07 13:07:04.000000000 +0100
+@@ -135,6 +135,7 @@
+     }
+     LAST_TRM = cur_term;
+     LAST_SEQ = ++sequence;
+    LAST_BUF = 0;
+ 
+     PC = 0;
+     UP = 0;
--- a/ncurses-5.5-20061209-xterm.patch
+++ b/ncurses-5.5-20061209-xterm.patch
@ -0,0 +1,20 @@
+--- 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
--- a/ncurses.spec
+++ b/ncurses.spec
@ -1,24 +1,22 @@
 Summary: A terminal handling library
 Name: ncurses
 Version: 5.5
-Release: 26.20060715%{?dist}
+Release: 27.20061209%{?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
-Source1: ncurses-linux
-Source2: ncurses-linux-m
 Source3: ncurses-resetall.sh
-Source4: ftp://invisible-island.net/ncurses/5.5/patch-5.5-20060625.sh.gz
-Patch1: ftp://invisible-island.net/ncurses/5.5/ncurses-5.5-20060701.patch.gz
-Patch2: ftp://invisible-island.net/ncurses/5.5/ncurses-5.5-20060708.patch.gz
-Patch3: ftp://invisible-island.net/ncurses/5.5/ncurses-5.5-20060715.patch.gz
-Patch5: ncurses-5.4-xterm-kbs.patch
-Patch6: ncurses-5.5-20060715-tgetent.patch
-Patch7: ncurses-5.5-20060715-tgetstr.patch
-Patch8: ncurses-5.5-20060715-cflags.patch
+
+Patch1: ftp://invisible-island.net/ncurses/5.5/ncurses-5.5-20060909-patch.sh.bz2
+Patch2: ncurses-5.5-20060909-20061209.patch.bz2
+
+Patch6: ncurses-5.5-20061209-tgetent.patch
+Patch7: ncurses-5.5-20061209-largetables.patch
+Patch8: ncurses-5.5-20061209-config.patch
 Patch9: ncurses-5.5-liblinks.patch
-BuildRequires: sharutils gpm-devel
+Patch10: ncurses-5.5-20061209-xterm.patch
+BuildRequires: gpm-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 %description
@ -50,16 +48,15 @@ Use the following compiler flags to build against the ncurses library:

 %prep
 %setup -q
-zcat %{SOURCE4} | sh > /dev/null
+
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1

-%patch5 -p1 -b .xterm-kbs
 %patch6 -p1 -b .tgetent
-%patch7 -p1 -b .tgetstr
-%patch8 -p1 -b .cflags
+%patch7 -p1 -b .largetables
+%patch8 -p1 -b .config
 %patch9 -p1 -b .liblinks
+%patch10 -p1 -b .xterm

 %build
 %define rootdatadir /lib
@ -68,21 +65,19 @@ zcat %{SOURCE4} | sh > /dev/null
    --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
    --with-install-prefix=$RPM_BUILD_ROOT \\\
    --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
+    --includedir=%{_includedir}/ncursesw \\\
    --enable-overwrite \\\
    --with-chtype=long

 mkdir narrowc widec
 cd narrowc
 ln -s ../configure .
-%configure %{ncurses_options} \
-    --includedir=%{_includedir}/ncurses
+%configure %{ncurses_options}
 make %{?_smp_mflags}

 cd ../widec
 ln -s ../configure .
-%configure %{ncurses_options} \
-    --enable-widec \
-    --includedir=%{_includedir}/ncursesw
+%configure %{ncurses_options} --enable-widec
 make %{?_smp_mflags}
 cd ..

@ -91,6 +86,7 @@ rm -rf ${RPM_BUILD_ROOT}

 make -C narrowc install
 make -C widec install
+make -C narrowc install.progs

 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
@ -119,7 +115,7 @@ done
 for termname in $baseterms; do
    termpath=terminfo/${termname::1}/$termname
    mkdir $RPM_BUILD_ROOT%{rootdatadir}/terminfo/${termname::1} || : &> /dev/null
-    mv $RPM_BUILD_ROOT%{_datadir}/$termpath $RPM_BUILD_ROOT/%{rootdatadir}/$termpath
+    mv $RPM_BUILD_ROOT%{_datadir}/$termpath $RPM_BUILD_ROOT%{rootdatadir}/$termpath
    ln -s $(dirname %{_datadir}/$termpath | \
        sed 's,\(^/\|\)[^/][^/]*,..,g')%{rootdatadir}/$termpath \
        $RPM_BUILD_ROOT%{_datadir}/$termpath
@ -128,6 +124,12 @@ done
 ln -sf ncurses/{curses,unctrl,eti,form,menu,ncurses,panel,term}.h \
    ${RPM_BUILD_ROOT}%{_includedir}

+# can't replace directory with symlink (rpm bug), symlink all headers
+mkdir $RPM_BUILD_ROOT%{_includedir}/ncurses
+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
@ -145,7 +147,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 %{rootdatadir}/terminfo
 %{_datadir}/terminfo
 %{_datadir}/tabset
-%{_bindir}/*
+%{_bindir}/[cirt]*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man7/*
@ -156,6 +158,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 %doc doc/html/hackguide.html
 %doc doc/html/ncurses-intro.html
 %doc c++/README*
+%{_bindir}/ncurses*-config
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %dir %{_includedir}/ncurses
@ -177,6 +180,12 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}

 %changelog
+* Mon Dec 11 2006 Miroslav Lichvar <mlichvar@redhat.com> 5.5-27.20061209
+- update to patch 20061209
+- strip large tables from shared libraries, reduce number of relocations
+- package utils linked with libncurses instead of libncursesw
+- package only wide-character headers
+
 * Thu Nov 30 2006 Miroslav Lichvar <mlichvar@redhat.com> 5.5-26.20060715
 - move also hardlinked entries (#217750)
 - search /etc/terminfo for local terminfo entries
--- a/6
+++ b/6
@ -1,5 +1,3 @@
 e73c1ac10b4bfc46db43b2ddfd6244ef  ncurses-5.5.tar.gz
-b3eae4c2ff35929f4cff7a594f845abd  patch-5.5-20060625.sh.gz
-afdb339e6bc6d524178b1f2538f98f96  ncurses-5.5-20060701.patch.gz
-1e166f462b6b00a294d701f0fd8321bd  ncurses-5.5-20060708.patch.gz
-cc0d0fc36a09733d55e6f01c06dfad93  ncurses-5.5-20060715.patch.gz
+65f5eec1980ece6ae8accfc6c9c527ac  ncurses-5.5-20060909-patch.sh.bz2
+3c54db0ba78467953bffa7cfc1f506e4  ncurses-5.5-20060909-20061209.patch.bz2