From bcf006effb6f3f4b77fd92e2d5a1663327787987 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 26 May 2008 09:30:51 +0000 Subject: [PATCH] - update to patch 20080524 - force installing wide libtinfo --- .cvsignore | 1 + ncurses.spec | 11 +++++++++-- sources | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 24df9dd..a7cdc5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ ncurses-5.6.tar.gz ncurses-5.6-20071201-patch.sh.bz2 ncurses-5.6-20071215-20080112.patch.bz2 ncurses-5.6-20080119-20080301.patch.bz2 +ncurses-5.6-20080308-20080524.patch.bz2 diff --git a/ncurses.spec b/ncurses.spec index 75e779e..21de43f 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,7 +1,7 @@ Summary: Ncurses support utilities Name: ncurses Version: 5.6 -Release: 16.20080301%{?dist} +Release: 17.20080524%{?dist} License: MIT Group: System Environment/Base URL: http://invisible-island.net/ncurses/ncurses.html @@ -10,6 +10,7 @@ Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz Patch1: ncurses-5.6-20071201-patch.sh.bz2 Patch2: ncurses-5.6-20071215-20080112.patch.bz2 Patch3: ncurses-5.6-20080119-20080301.patch.bz2 +Patch4: ncurses-5.6-20080308-20080524.patch.bz2 Patch8: ncurses-5.5-20061209-config.patch Patch9: ncurses-5.6-20070612-libs.patch @@ -95,6 +96,7 @@ The ncurses-static package includes static libraries of the ncurses library. rm -rf tack %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch8 -p1 -b .config %patch9 -p1 -b .libs @@ -132,6 +134,7 @@ cd .. rm -rf ${RPM_BUILD_ROOT} make -C narrowc DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data} +rm -f $RPM_BUILD_ROOT%{_libdir}/libtinfo.* make -C widec DESTDIR=$RPM_BUILD_ROOT install.{libs,includes,man} chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.* @@ -171,7 +174,7 @@ done 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 + screen.rxvt 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 @@ -255,6 +258,10 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon May 26 2008 Miroslav Lichvar 5.6-17.20080524 +- update to patch 20080524 +- force installing wide libtinfo + * Fri Mar 07 2008 Miroslav Lichvar 5.6-16.20080301 - update to patch 20080301 - provide libtermcap.so (#428898) diff --git a/sources b/sources index a28cb99..cdf53d1 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ b6593abe1089d6aab1551c105c9300e3 ncurses-5.6.tar.gz 5c4c833a31064c7099209f7a141fed10 ncurses-5.6-20071201-patch.sh.bz2 d32ba589cd7bfdc4ac82fd8078c06e2b ncurses-5.6-20071215-20080112.patch.bz2 0fe7ec33499e83e9a64f71ef3f555008 ncurses-5.6-20080119-20080301.patch.bz2 +41209f98c05d5b77c357f03c09164e60 ncurses-5.6-20080308-20080524.patch.bz2