From 302de499035d46bd9e9b9ed0067a4524c39a27c9 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Thu, 8 Mar 2007 14:04:24 +0000
Subject: [PATCH] - update to patch 20070303 - use one libtinfo for both
 libncurses and libncursesw - shorten -devel description

---
 .cvsignore   |  2 +-
 ncurses.spec | 22 +++++++++-------------
 sources      |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d0f637e..dea0423 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 ncurses-5.6.tar.gz
-ncurses-5.6-20061223-20070217.patch.bz2
+ncurses-5.6-20070303-patch.sh.bz2
diff --git a/ncurses.spec b/ncurses.spec
index b13cf15..7839a6b 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,17 +1,16 @@
 Summary: A terminal handling library
 Name: ncurses
 Version: 5.6
-Release: 5.20070217%{?dist}
+Release: 6.20070303%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://invisible-island.net/ncurses/ncurses.html
 Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
 
-Patch1: ncurses-5.6-20061223-20070217.patch.bz2
+Patch1: ncurses-5.6-20070303-patch.sh.bz2
 
 Patch6: ncurses-5.5-20061209-tgetent.patch
 Patch8: ncurses-5.5-20061209-config.patch
-Patch9: ncurses-5.5-liblinks.patch
 Patch10: ncurses-5.5-20061209-xterm.patch
 Patch11: ncurses-5.6-20070120-urxvt.patch
 BuildRequires: gpm-devel
@@ -35,14 +34,6 @@ the ncurses terminal handling library.
 Install the ncurses-devel package if you want to develop applications
 which will use ncurses.
 
-Use the following compiler flags to build against the ncurses library:
-
--lncurses
-(compile and link against the regular ncurses library)
-
--I %{_includedir}/ncursesw -lncursesw
-(compile and link against the wide-character, UTF-8, library)
-
 %package static
 Summary: Static libraries for the ncurses library
 Group: Development/Libraries
@@ -60,7 +51,6 @@ rm -rf tack
 
 %patch6 -p1 -b .tgetent
 %patch8 -p1 -b .config
-%patch9 -p1 -b .liblinks
 %patch10 -p1 -b .xterm
 %patch11 -p1 -b .urxvt
 
@@ -75,12 +65,13 @@ chmod 644 test/*
     --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
     --includedir=%{_includedir}/ncursesw \\\
     --enable-overwrite \\\
+    --with-termlib=tinfo \\\
     --with-chtype=long
 
 mkdir narrowc widec
 cd narrowc
 ln -s ../configure .
-%configure %{ncurses_options} --with-termlib --with-ticlib
+%configure %{ncurses_options} --with-ticlib
 make %{?_smp_mflags} libs
 make %{?_smp_mflags} -C progs
 
@@ -191,6 +182,11 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Thu Mar 08 2007 Miroslav Lichvar <mlichvar@redhat.com> 5.6-6.20070303
+- update to patch 20070303
+- use one libtinfo for both libncurses and libncursesw
+- shorten -devel description
+
 * Mon Feb 19 2007 Miroslav Lichvar <mlichvar@redhat.com> 5.6-5.20070217
 - update to patch 20070217
 - replace libcurses.so symlink with linker script (#228891)
diff --git a/sources b/sources
index a134f18..35d86de 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 b6593abe1089d6aab1551c105c9300e3  ncurses-5.6.tar.gz
-e57e5361507e41942b981af2efa50282  ncurses-5.6-20061223-20070217.patch.bz2
+8d3f8d5a55baa9b1feb163d152ce67f8  ncurses-5.6-20070303-patch.sh.bz2