From cfb9a4cdc20b82b860f843dff02cc603d20da27ee1318829d806098a41fa2a01 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 10 Apr 2008 09:41:25 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=11

---
 ncurses-5.6.dif | 29 ++++++++++++++++++++---------
 ncurses.changes |  5 +++++
 ncurses.spec    |  8 +++++---
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/ncurses-5.6.dif b/ncurses-5.6.dif
index dd2c645..300b726 100644
--- a/ncurses-5.6.dif
+++ b/ncurses-5.6.dif
@@ -131,7 +131,7 @@
  			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
  		fi
  		if test "$cf_cv_ld_rpath" = yes ; then
-@@ -8185,12 +8185,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -8186,12 +8186,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -149,7 +149,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -8200,7 +8203,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -8201,7 +8204,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -158,7 +158,7 @@
  CF_EOF
  fi
  
-@@ -8233,7 +8236,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -8234,7 +8237,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -167,7 +167,7 @@
  CF_EOF
  fi
  
-@@ -8242,22 +8245,22 @@ case "$MANPAGE_FORMAT" in #(vi
+@@ -8243,22 +8246,22 @@ case "$MANPAGE_FORMAT" in #(vi
  cat >>$cf_edit_man <<CF_EOF
  	if test \$form = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -196,7 +196,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -8266,15 +8269,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -8267,15 +8270,15 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -215,7 +215,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -8294,8 +8297,8 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -8295,8 +8298,8 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -226,7 +226,7 @@
  		test -n "\$aliases" && (
  			cd \$cf_subdir\${section} && (
  				for cf_alias in \$aliases
-@@ -8313,6 +8316,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -8314,6 +8317,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -234,7 +234,7 @@
  	;;
  esac
  done
-@@ -14081,7 +14085,7 @@ else
+@@ -14082,7 +14086,7 @@ else
  #line 14081 "configure"
  #include "confdefs.h"
  
@@ -243,7 +243,7 @@
  #include <stdio.h>
  
  #if defined(__cplusplus)
-@@ -15216,6 +15220,7 @@ if test "$with_termlib" != no ; then
+@@ -15217,6 +15221,7 @@ if test "$with_termlib" != no ; then
  		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
  		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
  	fi
@@ -324,6 +324,17 @@
  The \fBncurses\fR library permits manipulation of data structures,
  called \fIwindows\fR, which can be thought of as two-dimensional
  arrays of characters representing all or part of a CRT screen.  A
+--- misc/ncurses-config.in
++++ misc/ncurses-config.in	2008-04-10 11:12:06.528491302 +0200
+@@ -73,7 +73,7 @@ while test $# -gt 0; do
+ 		if test "${prefix}/include" != /usr/include ; then
+ 			INCS="-I${prefix}/include"
+ 		fi
+-		if test "@WITH_OVERWRITE@" != no ; then
++		if test "${THIS%[0-9]*}" != ncurses ; then
+ 			INCS="$INCS -I${prefix}/include/${THIS}"
+ 		fi
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
 --- misc/terminfo.src
 +++ misc/terminfo.src	2007-01-31 14:27:30.000000000 +0100
 @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
diff --git a/ncurses.changes b/ncurses.changes
index 260ed74..218ece4 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 10 11:17:20 CEST 2008 - werner@suse.de
+
+- Small change to make the cflags work in ncurses{w,t,tw}-config
+
 -------------------------------------------------------------------
 Wed Apr  8 19:20:00 CEST 2008 - werner@suse.de
 
diff --git a/ncurses.spec b/ncurses.spec
index bf2f4c9..c55ffd6 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -20,7 +20,7 @@ License:        X11/MIT
 Group:          System/Base
 AutoReqProv:    on
 Version:        5.6
-Release:        71
+Release:        72
 Summary:        New curses Libraries
 Source0:        ncurses-5.6.tar.bz2
 Url:            http://invisible-island.net/ncurses/ncurses.html
@@ -55,7 +55,7 @@ Authors:
     Eric S. Raymond <esr@thyrsus.com>
     Thomas E. Dickey <dickey@invisible-island.net>
     Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
-    Pavel Curtis 
+    Pavel Curtis
 
 %package -n libncurses5
 License:        X11/MIT
@@ -77,7 +77,7 @@ Authors:
     Eric S. Raymond <esr@thyrsus.com>
     Thomas E. Dickey <dickey@invisible-island.net>
     Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
-    Pavel Curtis 
+    Pavel Curtis
 
 %package -n terminfo
 Summary:        A terminal descriptions database
@@ -439,6 +439,8 @@ tar Oxfj %{SOURCE1} | patch -p1 -s
 %defattr(-,root,root)
 
 %changelog
+* Thu Apr 10 2008 werner@suse.de
+- Small change to make the cflags work in ncurses{w,t,tw}-config
 * Tue Apr 08 2008 werner@suse.de
 - New sub package libncurses5 including the shared libraries and
   the required terminfo and termset data files.