- update to patch 20100130

- fix ncursesw5-config and pc files to use correct tinfo

.cvsignore

@@ -1,3 +1,3 @@
 ncurses-5.7.tar.gz
 ncurses-5.7-20091107-patch.sh.bz2
-ncurses-5.7-20091114-20100123.patch.bz2
+ncurses-5.7-20091114-20100130.patch.bz2

ncurses-5.7-20100116-config.patch

@@ -1,7 +1,45 @@
+diff -up ncurses-5.7/misc/gen-pkgconfig.in.config ncurses-5.7/misc/gen-pkgconfig.in
+--- ncurses-5.7/misc/gen-pkgconfig.in.config	2010-02-03 18:02:14.000000000 +0100
++++ ncurses-5.7/misc/gen-pkgconfig.in	2010-02-03 18:19:42.000000000 +0100
+@@ -44,6 +44,7 @@ MENU_NAME=menu # @MENU_NAME@
+ FORM_NAME=form # @FORM_NAME@
+ CXX_NAME=ncurses++ # @CXX_NAME@
+ DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
++TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
+ CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
+ 
+ prefix="@prefix@"
+@@ -57,16 +58,14 @@ show_includedir='@includedir@'
+ show_libdir='@libdir@'
+ 
+ MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@"
+-SUB_LIBRARY="${TINFO_NAME}@DFT_ARG_SUFFIX@"
++SUB_LIBRARY="${TINFO_ARG_SUFFIX}"
+ PANEL_LIBRARY="${PANEL_NAME}@DFT_ARG_SUFFIX@"
+ MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@"
+ FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@"
+ 
+ SUB_LIBRARY_REQ=${SUB_LIBRARY}
+-TINFO_NAME_REQ=${TINFO_NAME}
+ if test $TINFO_NAME = $LIB_NAME ; then
+ 	SUB_LIBRARY_REQ=
+-	TINFO_NAME_REQ=
+ fi
+ 
+ for lib in ../lib/*
+@@ -88,7 +87,7 @@ do
+ 
+ 	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
+ 	if test $name = $MAIN_LIBRARY ; then
+-		reqs=$TINFO_NAME_REQ
++		reqs=$SUB_LIBRARY_REQ
+ 		desc="$desc library"
+ 	elif test $name = $SUB_LIBRARY ; then
+ 		reqs=
 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	2010-01-18 14:35:20.000000000 +0100
 +++ ncurses-5.7/misc/ncurses-config.in	2010-01-18 14:37:01.000000000 +0100
-@@ -35,7 +35,6 @@ exec_prefix="@exec_prefix@"
+@@ -35,12 +35,11 @@ exec_prefix="@exec_prefix@"
  
  bindir="@bindir@"
  includedir="@includedir@"
@@ -9,6 +47,12 @@ diff -up ncurses-5.7/misc/ncurses-config.in.config ncurses-5.7/misc/ncurses-conf
  datadir="@datadir@"
  mandir="@mandir@"
  
+ THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
+-TINFO_LIB="@TINFO_NAME@@DFT_ARG_SUFFIX@"
++TINFO_LIB="@TINFO_ARG_SUFFIX@"
+ 
+ LANG=C;		export LANG
+ LANGUAGE=C;	export LANGUAGE
 @@ -85,11 +84,11 @@ ENDECHO
  	--libs)
  		if test @TINFO_NAME@ = @LIB_NAME@ ; then

ncurses-5.7-20100123-headerdeps.patch

@@ -1,17 +0,0 @@
-diff -up ncurses-5.7/ncurses/Makefile.in.headerdeps ncurses-5.7/ncurses/Makefile.in
---- ncurses-5.7/ncurses/Makefile.in.headerdeps	2010-01-25 10:58:59.000000000 +0100
-+++ ncurses-5.7/ncurses/Makefile.in	2010-01-25 11:06:59.000000000 +0100
-@@ -157,10 +157,10 @@ AUTO_SRC = \
- HEADER_DEPS	= \
- 	$(srcdir)/curses.priv.h \
- 	$(INCDIR)/ncurses_dll.h \
--	$(INCDIR)/ncurses_cfg.h \
--	$(INCDIR)/curses.h \
-+	../include/ncurses_cfg.h \
-+	../include/curses.h \
- 	$(INCDIR)/nc_panel.h \
--	$(INCDIR)/term.h \
-+	../include/term.h \
- 	$(INCDIR)/term_entry.h \
- 	$(INCDIR)/nc_tparm.h \
- 	$(INCDIR)/nc_alloc.h \

ncurses.spec

@@ -1,20 +1,19 @@
 Summary: Ncurses support utilities
 Name: ncurses
 Version: 5.7
-Release: 6.20100123%{?dist}
+Release: 7.20100130%{?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.7-20091107-patch.sh.bz2
-Patch2: ncurses-5.7-20091114-20100123.patch.bz2
+Patch2: ncurses-5.7-20091114-20100130.patch.bz2
 
 Patch8: ncurses-5.7-20100116-config.patch
 Patch9: ncurses-5.6-20070612-libs.patch
 Patch11: ncurses-5.6-20080112-urxvt.patch
 Patch12: ncurses-5.6-20080628-kbs.patch
-Patch13: ncurses-5.7-20100123-headerdeps.patch
 BuildRequires: gpm-devel pkgconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,7 +97,6 @@ The ncurses-static package includes static libraries of the ncurses library.
 %patch9 -p1 -b .libs
 %patch11 -p1 -b .urxvt
 %patch12 -p1 -b .kbs
-%patch13 -p1 -b .headerdeps
 
 # this will be in documentation, drop executable bits
 cp -p install-sh test
@@ -276,6 +274,10 @@ bzip2 NEWS
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Wed Feb 03 2010 Miroslav Lichvar <mlichvar@redhat.com> 5.7-7.20100130
+- update to patch 20100130
+- fix ncursesw5-config and pc files to use correct tinfo
+
 * Mon Jan 25 2010 Miroslav Lichvar <mlichvar@redhat.com> 5.7-6.20100123
 - update to patch 20100123
 - remove AS_NEEDED from linker scripts

sources

@@ -1,3 +1,3 @@
 cce05daf61a64501ef6cd8da1f727ec6  ncurses-5.7.tar.gz
 7c840a1fa324d4e971414ae647600fc9  ncurses-5.7-20091107-patch.sh.bz2
-a1aaf2d921e6c0acae3866b5c535884a  ncurses-5.7-20091114-20100123.patch.bz2
+65ceeb747e4ff5be824e8f32193a54e4  ncurses-5.7-20091114-20100130.patch.bz2