From 9a91bc2c991dd76b62c34170e247b5dcfd2d7dd4 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 10 Feb 2009 15:02:00 +0000 Subject: [PATCH] - update to 5.7, patch 20090207 - use default pcf in xterm description - include NEWS --- .cvsignore | 5 ++-- ncurses-5.5-20061209-config.patch | 27 ------------------- ncurses-5.6-20080112-xterm.patch | 12 --------- ncurses-5.7-20090124-config.patch | 28 +++++++++++++++++++ ncurses.spec | 45 ++++++++++++++++++++----------- sources | 5 ++-- 6 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 ncurses-5.5-20061209-config.patch delete mode 100644 ncurses-5.6-20080112-xterm.patch create mode 100644 ncurses-5.7-20090124-config.patch diff --git a/.cvsignore b/.cvsignore index 1b8d8ec..a5838c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -ncurses-5.6.tar.gz -ncurses-5.6-20080621-patch.sh.bz2 -ncurses-5.6-20080628-20080927.patch.bz2 +ncurses-5.7.tar.gz +ncurses-5.7-20081115-20090207.patch.bz2 diff --git a/ncurses-5.5-20061209-config.patch b/ncurses-5.5-20061209-config.patch deleted file mode 100644 index 69b080e..0000000 --- a/ncurses-5.5-20061209-config.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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}" diff --git a/ncurses-5.6-20080112-xterm.patch b/ncurses-5.6-20080112-xterm.patch deleted file mode 100644 index a0b96a7..0000000 --- a/ncurses-5.6-20080112-xterm.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 -@@ -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, diff --git a/ncurses-5.7-20090124-config.patch b/ncurses-5.7-20090124-config.patch new file mode 100644 index 0000000..0dc3c45 --- /dev/null +++ b/ncurses-5.7-20090124-config.patch @@ -0,0 +1,28 @@ +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 2009-01-23 13:44:17.000000000 +0100 ++++ ncurses-5.7/misc/ncurses-config.in 2009-01-23 14:00:38.000000000 +0100 +@@ -35,7 +35,6 @@ exec_prefix="@exec_prefix@" + + bindir="@bindir@" + includedir="@includedir@" +-libdir="@libdir@" + datadir="@datadir@" + mandir="@mandir@" + +@@ -83,7 +82,7 @@ ENDECHO + ;; + --libs) + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO +- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ ++ @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ + ENDECHO + ;; + # identification +@@ -107,7 +106,6 @@ ENDECHO + echo "${includedir}" + ;; + --libdir) +- echo "${libdir}" + ;; + --mandir) + echo "${mandir}" diff --git a/ncurses.spec b/ncurses.spec index bdd975a..730bd06 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,21 +1,19 @@ Summary: Ncurses support utilities Name: ncurses -Version: 5.6 -Release: 20.20080927%{?dist} +Version: 5.7 +Release: 1.20090207%{?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.6-20080621-patch.sh.bz2 -Patch2: ncurses-5.6-20080628-20080927.patch.bz2 +Patch1: ncurses-5.7-20081115-20090207.patch.bz2 -Patch8: ncurses-5.5-20061209-config.patch +Patch8: ncurses-5.7-20090124-config.patch Patch9: ncurses-5.6-20070612-libs.patch -Patch10: ncurses-5.6-20080112-xterm.patch Patch11: ncurses-5.6-20080112-urxvt.patch Patch12: ncurses-5.6-20080628-kbs.patch -BuildRequires: gpm-devel +BuildRequires: gpm-devel pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -69,6 +67,7 @@ the ncurses-base package. Summary: Development files for the ncurses library Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} +Requires: pkgconfig Obsoletes: libtermcap-devel < 2.0.8-48 Provides: libtermcap-devel = 2.0.8-48 @@ -91,13 +90,9 @@ The ncurses-static package includes static libraries of the ncurses library. %setup -q %patch1 -p1 -# tack isn't in ncurses tree since 20070203 -rm -rf tack -%patch2 -p1 %patch8 -p1 -b .config %patch9 -p1 -b .libs -%patch10 -p1 -b .xterm %patch11 -p1 -b .urxvt %patch12 -p1 -b .kbs @@ -105,6 +100,11 @@ rm -rf tack cp -p install-sh test chmod 644 test/* +for f in ANNOUNCE; do + iconv -f iso8859-1 -t utf8 -o ${f}{_,} && + touch -r ${f}{,_} && mv -f ${f}{_,} +done + %build %define rootdatadir /lib %define ncurses_options \\\ @@ -112,9 +112,12 @@ chmod 644 test/* --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\ --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\ --enable-overwrite \\\ + --enable-pc-files \\\ --with-termlib=tinfo \\\ --with-chtype=long +export PKG_CONFIG_LIBDIR=%{_libdir}/pkgconfig + mkdir narrowc widec cd narrowc ln -s ../configure . @@ -170,9 +173,10 @@ done # prepare -base and -term file lists for termname in \ - Eterm\* cons25 cygwin gnome\* hurd jfbterm mach\* mlterm mrxvt \ - nsterm putty\* pcansi rxvt rxvt-\* screen screen-\* screen.\* \ - sun teraterm wsvt25\* xfce xterm xterm-\* + Eterm\* aterm 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 \ + wsvt25\* xfce xterm xterm-\* do for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do @@ -204,7 +208,10 @@ echo "INPUT(-lncursesw)" > $RPM_BUILD_ROOT%{_libdir}/libcursesw.so echo "INPUT(-ltinfo)" > $RPM_BUILD_ROOT%{_libdir}/libtermcap.so -rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo +rm -f $RPM_BUILD_ROOT%{_libdir}/terminfo +rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/{*_g,ncurses++*}.pc + +bzip2 NEWS %post libs -p /sbin/ldconfig @@ -212,7 +219,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo %files %defattr(-,root,root) -%doc ANNOUNCE AUTHORS README TO-DO +%doc ANNOUNCE AUTHORS NEWS.bz2 README TO-DO %{_bindir}/[cirt]* %{_mandir}/man1/* %{_mandir}/man5/* @@ -242,6 +249,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo %doc misc/ncurses.supp %{_bindir}/ncurses*-config %{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc %dir %{_includedir}/ncurses %dir %{_includedir}/ncursesw %{_includedir}/ncurses/*.h @@ -257,6 +265,11 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Feb 10 2009 Miroslav Lichvar 5.7-1.20090207 +- update to 5.7, patch 20090207 +- use default pcf in xterm description +- include NEWS + * Thu Oct 02 2008 Miroslav Lichvar 5.6-20.20080927 - update to patch 20080927 diff --git a/sources b/sources index c7aa609..c41aa7f 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -b6593abe1089d6aab1551c105c9300e3 ncurses-5.6.tar.gz -dacd429b696f41ff9c3fb5a886bb1baa ncurses-5.6-20080621-patch.sh.bz2 -c29a3ccf066633d46bdeef783777e6a8 ncurses-5.6-20080628-20080927.patch.bz2 +cce05daf61a64501ef6cd8da1f727ec6 ncurses-5.7.tar.gz +384a4ed30c14a6a167980114af4a07bf ncurses-5.7-20081115-20090207.patch.bz2