From beaf19d74247ceefb4acefe6991bf340dac036650651549a4ea9286711086b26 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 5 Sep 2008 18:06:00 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=21

---
 ncurses.changes | 10 ++++++++++
 ncurses.spec    | 16 ++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ncurses.changes b/ncurses.changes
index 4f10971..d80178a 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep  4 11:55:11 CEST 2008 - werner@suse.de
+
+- Correct order of include paths in ncurses6 case
+
+-------------------------------------------------------------------
+Mon Sep  1 14:44:38 CEST 2008 - werner@suse.de
+
+- Provide also termcap.h in /usr/include
+
 -------------------------------------------------------------------
 Thu Aug 28 16:00:36 CEST 2008 - ro@suse.de
 
diff --git a/ncurses.spec b/ncurses.spec
index 7d67309..ebd4737 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -27,7 +27,7 @@ License:        X11/MIT
 Group:          System/Base
 AutoReqProv:    on
 Version:        5.6
-Release:        87
+Release:        88
 Summary:        New curses Libraries
 Url:            http://invisible-island.net/ncurses/ncurses.html
 Source0:        ncurses-5.6.tar.bz2
@@ -199,7 +199,11 @@ License:        X11/MIT
 Group:          Development/Libraries/C and C++
 Provides:       ncurses:%{_incdir}/ncurses.h
 Requires:       ncurses = %{version}-%{release}, %{_bindir}/tack
+%if %abi >= 6
+Requires:       libncurses6
+%else
 Requires:       libncurses5 libncurses6
+%endif
 AutoReqProv:    on
 
 %description -n ncurses-devel
@@ -381,7 +385,7 @@ ln -sf tack-* tack
     lib=%{_libdir}
     inc=%{_incdir}/ncurses
     make install DESTDIR=%{root} includedir=${inc} libdir=${lib}
-    ln -sf ${inc##*/}/{curses,ncurses,term}.h %{root}${inc%%/*}/
+    ln -sf ${inc##*/}/{curses,ncurses,term,termcap}.h %{root}${inc%%/*}/
     sh %{S:6} --cflags "-I${inc}" --libs "-lncurses" %{root}%{_bindir}/ncurses5-config
     #
     # Check for tack program on base of above ncurses
@@ -404,7 +408,7 @@ ln -sf tack-* tack
     inc=%{_incdir}/ncurses6/ncurses
     make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib}
     ln -sf ${inc##*/}/{curses,ncurses,term}.h %{root}${inc%%/*}/
-    sh %{S:6} --cflags "-I${inc%%/*} -I${inc}" --libs "-L${lib} -lncurses" %{root}%{_bindir}/ncurses6-config
+    sh %{S:6} --cflags "-I${inc} -I${inc%%/*}" --libs "-L${lib} -lncurses" %{root}%{_bindir}/ncurses6-config
 %endif
     #
     # Now use --enable-widec for UTF8/wide character support.
@@ -430,7 +434,7 @@ ln -sf tack-* tack
     lib=%{_libdir}/ncurses6
     inc=%{_incdir}/ncurses6/ncursesw
     make install.libs install.includes DESTDIR=%{root} includedir=${inc} libdir=${lib}
-    sh %{S:6} --cflags "-I${inc%%/*} -I${inc}" --libs "-L${lib} -lncursesw" %{root}%{_bindir}/ncursesw6-config
+    sh %{S:6} --cflags "-I${inc} -I${inc%%/*}" --libs "-L${lib} -lncursesw" %{root}%{_bindir}/ncursesw6-config
 %endif
 
 %install
@@ -633,6 +637,10 @@ ln -sf tack-* tack
 %defattr(-,root,root)
 
 %changelog
+* Thu Sep 04 2008 werner@suse.de
+- Correct order of include paths in ncurses6 case
+* Mon Sep 01 2008 werner@suse.de
+- Provide also termcap.h in /usr/include
 * Thu Aug 28 2008 ro@suse.de
 - require libncurses5 _and_ libncurses6 from ncurses-devel
   (avoid having a version with only static libs in the