Accepting request 326408 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/326408
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=108

ncurses-5.9-avoid-line-markers.dif

@@ -1,11 +0,0 @@
---- ncurses/Makefile.in.orig	2015-01-21 13:27:02.427199242 +0100
-+++ ncurses/Makefile.in	2015-01-21 13:27:11.946311063 +0100
-@@ -219,7 +219,7 @@
- 	sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
- 
- ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
--	sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
-+	sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS) -P" "$(AWK)" generated <../include/curses.h >$@
- 
- init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list
- 	./make_keys$(BUILD_EXEEXT) keys.list > $@

ncurses-5.9-overwrite.dif

@@ -17,9 +17,9 @@
 +++ configure	2013-09-30 09:17:52.000000000 +0000
 @@ -6956,6 +6956,7 @@ else
  fi;
- echo "$as_me:6957: result: $with_overwrite" >&5
+ echo "$as_me:6984: result: $with_overwrite" >&5
  echo "${ECHO_T}$with_overwrite" >&6
 +WITH_OVERWRITE="$with_overwrite"
  
- echo "$as_me:6960: checking if external terminfo-database is used" >&5
+ echo "$as_me:6987: checking if external terminfo-database is used" >&5
  echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6

ncurses-5.9-patches.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1013f5bab80b0af2d7c8c8c17499920a5614f2d3448a42635dde249eccd2c7d0
-size 4916819

ncurses-5.9.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5dd699104648b6da0212bc2c65c2b7bf101795a634c7e2b4f5976715339bcf8d
-size 2043534

ncurses-6.0-avoid-line-markers.dif

@@ -0,0 +1,15 @@
+---
+ ncurses/Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- ncurses/Makefile.in
++++ ncurses/Makefile.in	2015-08-13 15:08:16.989519655 +0000
+@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
+ 	$(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
+ 
+ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
+-	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
++	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS) -P" "$(AWK)" generated <../include/curses.h >$@
+ 
+ init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list
+ 	./make_keys$(BUILD_EXEEXT) keys.list > $@

ncurses-6.0-patches.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b53f39b902abe42e92cb9439db0bae29beaa889ecdc60980576a29186b2d4a9
+size 45308

ncurses-6.0.dif

@@ -9,7 +9,7 @@
  man/ncurses.3x               |    4 +
  misc/gen-pkgconfig.in        |    7 +-
  misc/ncurses-config.in       |    2 
- misc/terminfo.src            |  131 ++++++++++++++++++++++++++++++++++---------
+ misc/terminfo.src            |  130 ++++++++++++++++++++++++++++++++++---------
  ncurses/Makefile.in          |    2 
  ncurses/curses.priv.h        |    2 
  ncurses/run_cmd.sh           |   11 +++
@@ -19,11 +19,11 @@
  ncurses/tinfo/read_entry.c   |    2 
  ncurses/tinfo/read_termcap.c |   21 ++++--
  test/test.priv.h             |    4 -
- 20 files changed, 240 insertions(+), 79 deletions(-)
+ 20 files changed, 239 insertions(+), 79 deletions(-)
 
 --- aclocal.m4
 +++ aclocal.m4	2015-04-27 10:47:04.000000000 +0000
-@@ -554,7 +554,7 @@ AC_MSG_CHECKING([for size of bool])
+@@ -560,7 +560,7 @@ AC_MSG_CHECKING([for size of bool])
  AC_CACHE_VAL(cf_cv_type_of_bool,[
  	rm -f cf_test.out
  	AC_TRY_RUN([
@@ -32,7 +32,7 @@
  #include <stdio.h>
  
  #if defined(__cplusplus)
-@@ -4507,12 +4507,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4514,12 +4514,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -50,7 +50,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -4522,7 +4525,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4529,7 +4532,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -59,7 +59,7 @@
  CF_EOF
  fi
  
-@@ -4562,7 +4565,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4569,7 +4572,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -68,7 +68,7 @@
  CF_EOF
  fi
  
-@@ -4571,23 +4574,23 @@ case "$MANPAGE_FORMAT" in
+@@ -4578,23 +4581,23 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test \$form = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -98,7 +98,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -4596,7 +4599,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4603,7 +4606,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -107,7 +107,7 @@
  							then
  								continue
  							fi
-@@ -4606,18 +4609,18 @@ CF_EOF
+@@ -4613,18 +4616,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -129,7 +129,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -4637,9 +4640,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4644,9 +4647,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -142,7 +142,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -4659,6 +4662,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4666,6 +4669,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -152,7 +152,7 @@
  done
 --- configure.in
 +++ configure.in	2012-01-30 16:31:47.000000000 +0000
-@@ -1924,6 +1924,7 @@ if test "$with_termlib" != no ; then
+@@ -1918,6 +1918,7 @@ if test "$with_termlib" != no ; then
  		TINFO_LDFLAGS="-L${LIB_DIR}"
  		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
  	fi
@@ -162,7 +162,7 @@
  	TINFO_NAME=${LIB_NAME}
 --- configure
 +++ configure	2015-04-27 10:46:08.000000000 +0000
-@@ -5832,7 +5832,7 @@ case $cf_cv_system_name in
+@@ -5857,7 +5857,7 @@ case $cf_cv_system_name in
  	fi
  	;;
  (linux*|gnu*|k*bsd*-gnu)
@@ -171,7 +171,7 @@
  	;;
  (openbsd[2-9].*|mirbsd*)
  	LD_RPATH_OPT="-Wl,-rpath,"
-@@ -11326,12 +11326,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11344,12 +11344,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -189,7 +189,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -11341,7 +11344,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11359,7 +11362,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -198,7 +198,7 @@
  CF_EOF
  fi
  
-@@ -11381,7 +11384,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11399,7 +11402,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -207,7 +207,7 @@
  CF_EOF
  fi
  
-@@ -11390,23 +11393,23 @@ case "$MANPAGE_FORMAT" in
+@@ -11408,23 +11411,23 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test \$form = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -237,7 +237,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -11415,7 +11418,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11433,7 +11436,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -246,7 +246,7 @@
  							then
  								continue
  							fi
-@@ -11425,18 +11428,18 @@ CF_EOF
+@@ -11443,18 +11446,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -268,7 +268,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -11456,9 +11459,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11474,9 +11477,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -281,7 +281,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -11478,6 +11481,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11496,6 +11499,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -289,7 +289,7 @@
  	;;
  esac
  done
-@@ -21610,6 +21614,7 @@ if test "$with_termlib" != no ; then
+@@ -21637,6 +21641,7 @@ if test "$with_termlib" != no ; then
  		TINFO_LDFLAGS="-L${LIB_DIR}"
  		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
  	fi
@@ -349,20 +349,20 @@
  # Other:
  tack.1m				tack.1
 --- man/ncurses.3x
-+++ man/ncurses.3x	2012-01-30 16:44:35.000000000 +0000
++++ man/ncurses.3x	2015-07-28 12:32:16.000000000 +0000
-@@ -119,6 +119,10 @@ after the shell environment variable \fB
+@@ -121,6 +121,10 @@ after the shell environment variable \fB
- \fB@TSET@(1)\fR is usually responsible for doing this.
  [See \fBterminfo\fR(\*n) for further details.]
+ .SS Datatypes
  .PP
 +Beware: the terminal your program is running may or may not have
 +the features you expect. Ncurses makes no attempt to check available
-+features in advance. This is upto the programmer.
++features in advance. This is upon the programmer.
 +.PP
  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.
 --- misc/gen-pkgconfig.in
-+++ misc/gen-pkgconfig.in	2015-05-04 09:00:48.177518503 +0000
++++ misc/gen-pkgconfig.in	2015-05-04 09:00:48.000000000 +0000
 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
  fi
  
@@ -372,7 +372,7 @@
  	LDFLAGS="$LDFLAGS -L\${libdir}"
  fi
  if test "x@EXTRA_LDFLAGS@" != "x" ; then
-@@ -109,6 +109,7 @@ do
+@@ -110,6 +110,7 @@ do
  	LIBS="-l$name"
  
  	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
@@ -380,7 +380,7 @@
  	reqs=
  
  	if test $name = $MAIN_LIBRARY ; then
-@@ -118,9 +119,11 @@ do
+@@ -119,9 +120,11 @@ do
  		desc="$desc terminal interface library"
  	elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
  		reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
@@ -392,7 +392,7 @@
  		desc="$desc add-on library"
  	fi
  
-@@ -130,6 +133,8 @@ do
+@@ -131,6 +134,8 @@ do
  	   test $NEED_TINFO != yes ; then
  		test -n "$reqs" && reqs="$reqs, "
  		reqs="${reqs}${SUB_LIBRARY}${suffix}"
@@ -413,7 +413,7 @@
  		fi
  		if test "${includedir}" != /usr/include ; then
 --- misc/terminfo.src
-+++ misc/terminfo.src	2015-06-01 08:26:54.890018864 +0000
++++ misc/terminfo.src	2015-06-01 08:26:55.000000000 +0000
 @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
  	am,
  	cols#80,
@@ -689,7 +689,7 @@
  	kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
  	mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
  	rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=,
-@@ -5844,7 +5912,7 @@ pty|4bsd pseudo teletype,
+@@ -5849,7 +5917,7 @@ pty|4bsd pseudo teletype,
  #### Emacs
  
  # The codes supported by the term.el terminal emulation in GNU Emacs 19.30
@@ -698,7 +698,7 @@
  	am, mir, xenl,
  	cols#80, lines#24,
  	bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M,
-@@ -5857,6 +5925,13 @@ eterm|gnu emacs term.el terminal emulati
+@@ -5862,6 +5930,13 @@ eterm|gnu emacs term.el terminal emulati
  	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
  	sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
  	smul=\E[4m,
@@ -712,7 +712,7 @@
  
  # The codes supported by the term.el terminal emulation in GNU Emacs 22.2
  eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
-@@ -5957,7 +6032,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -5962,7 +6037,7 @@ screen|VT 100/ANSI X3.64 virtual termina
  	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
  	enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH,
  	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0,
@@ -721,7 +721,7 @@
  	kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
  	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
  	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-@@ -6153,7 +6228,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
+@@ -6158,7 +6233,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
  	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
  	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
  	el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL,
@@ -730,7 +730,7 @@
  	kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
  	kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH,
  	nel=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
-@@ -7896,7 +7971,7 @@ hp700-wy|HP700/41 emulating wyse30,
+@@ -7901,7 +7976,7 @@ hp700-wy|HP700/41 emulating wyse30,
  	ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>,
  	sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>,
  	smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c,
@@ -739,7 +739,7 @@
  	am, da, db, xhp,
  	cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8,
  	acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA,
-@@ -11030,6 +11105,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
+@@ -11035,6 +11110,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
  # at support for the VT320 itself.
  # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
  # (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@@ -747,7 +747,7 @@
  vt320-k3|MS-Kermit 3.00's vt320 emulation,
  	am, eslok, hs, km, mir, msgr, xenl,
  	cols#80, it#8, lines#49, pb#9600, vt#3,
-@@ -11039,7 +11115,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
+@@ -11044,7 +11120,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
  	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
  	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
  	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -756,7 +756,7 @@
  	dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
  	flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l,
  	fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
-@@ -15315,7 +15391,7 @@ ibm3101|i3101|IBM 3101-10,
+@@ -15320,7 +15396,7 @@ ibm3101|i3101|IBM 3101-10,
  	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
  	el=\EI, home=\EH, hts=\E0, ind=^J, kcub1=\ED, kcud1=\EB,
  	kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH,
@@ -765,7 +765,7 @@
  	is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B,
  	sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t%{80}%|%;%c%?%p9%t\E>A%e\E>B%;,
  	sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162,
-@@ -15556,7 +15632,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+@@ -15561,7 +15637,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
  	tbc=\E[3g,
  # "Megapel" refers to the display adapter, which was used with the IBM RT
  # aka IBM 6150.
@@ -775,19 +775,19 @@
  	s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
  ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
 --- ncurses/Makefile.in
-+++ ncurses/Makefile.in	2011-02-28 13:39:31.000000000 +0000
++++ ncurses/Makefile.in	2015-08-13 15:06:19.805518465 +0000
 @@ -216,7 +216,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
  ./fallback.c : $(tinfo)/MKfallback.sh
--	sh -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
+-	$(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
-+	sh -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
++	$(SHELL) -e $(srcdir)/run_cmd.sh $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
  
  ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
- 	sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
+ 	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
 --- ncurses/curses.priv.h
 +++ ncurses/curses.priv.h	2014-10-13 12:22:30.000000000 +0000
-@@ -2016,6 +2016,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
+@@ -2017,6 +2017,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
  extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
  extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
  extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@@ -888,7 +888,7 @@
  {
 --- ncurses/tinfo/lib_setup.c
 +++ ncurses/tinfo/lib_setup.c	2011-02-28 13:40:42.000000000 +0000
-@@ -583,6 +583,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
+@@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
      } else if ((value = tigetnum("U8")) >= 0) {
  	result = value;		/* use extension feature */
      } else if ((env = getenv("TERM")) != 0) {

ncurses-6.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260
+size 3131891

ncurses.changes

@@ -1,3 +1,135 @@
+-------------------------------------------------------------------
+Mon Aug 17 07:18:34 UTC 2015 - werner@suse.de
+
+- Add ncurses patch 20150815
+  + disallow "no" as a possible value for "--with-shlib-version" option,
+    overlooked in cleanup-changes for 20000708 (report by Tommy Alex).
+  + update release notes in INSTALL.
+  + regenerate llib-* files to help with review for release notes.
+- Modify patch ncurses-5.9-overwrite.dif
+
+-------------------------------------------------------------------
+Fri Aug 14 14:26:52 UTC 2015 - werner@suse.de
+
+- Add ncurses patch 20150810
+  + workaround for Debian #65617, which was fixed in mawk's upstream
+    releases in 2009 (report by Sven Joachim).  See
+          http://invisible-island.net/mawk/CHANGES.html#t20090727
+- Move infocmp from devel to utils package for ruby readline implementation 
+
+-------------------------------------------------------------------
+Mon Aug 12 10:11:22 UTC 2015 - werner@suse.de
+
+- Update to official ncurses 6.0
+  + based on the patch 20150808
+- Port and rename several patches
+  ncurses-5.9-avoid-line-markers.dif becomes ncurses-6.0-avoid-line-markers.dif
+  ncurses-5.9.dif becomes ncurses-6.0.dif
+- Add ncurses patch 20150808
+  + build-fix for Ada95 on older platforms without stdint.h
+  + build-fix for Solaris, whose /bin/sh and /usr/bin/sed are non-POSIX.
+  + update release announcement, summarizing more than 800 changes across
+    more than 200 snapshots.
+  + minor fixes to manpages, etc., to simplify linking from announcement
+    page.
+
+-------------------------------------------------------------------
+Tue Jul 28 12:26:57 UTC 2015 - werner@suse.de
+
+- Add ncurses patch 20150725
+  + updated llib-* files.
+  + build-fixes for ncurses library "test_progs" rule.
+  + use alternate workaround for gcc 5.x feature (adapted from patch by
+    Mikhail Peselnik).
+  + add status line to tmux via xterm+sl (patch by Nicholas Marriott).
+  + fixes for st 0.5 from testing with tack -TD
+  + review/improve several manual pages to break up wall-of-text:
+    curs_add_wch.3x, curs_attr.3x, curs_bkgd.3x, curs_bkgrnd.3x,
+    curs_getcchar.3x, curs_getch.3x, curs_kernel.3x, curs_mouse.3x,
+    curs_outopts.3x, curs_overlay.3x, curs_pad.3x, curs_termattrs.3x
+    curs_trace.3x, and curs_window.3x
+
+-------------------------------------------------------------------
+Mon Jul 27 12:01:41 UTC 2015 - werner@suse.de
+
+- Rework fixing the pkg-config files 
+
+-------------------------------------------------------------------
+Mon Jul 20 08:09:33 UTC 2015 - werner@suse.de
+
+- Add ncurses patch 20150719
+  + correct an old logic error for %A and %O in tparm (report by "zreed").
+  + improve documentation for signal handlers by adding section in the
+    curs_initscr.3x page.
+  + modify logic in make_keys.c to not assume anything about the size
+    of strnames and strfnames variables, since those may be functions
+    in the thread- or broken-linker configurations (problem found by
+    Coverity).
+  + modify test/configure script to check for pthreads configuration,
+    e.g., ncursestw library.
+
+-------------------------------------------------------------------
+Mon Jul 13 12:34:48 UTC 2015 - werner@suse.de
+
+- Add ncurses patch 20150711 pre-release
+  + modify scripts to build/use test-packages for the pthreads
+    configuration of ncurses6.
+  + add references to ttytype and termcap symbols in demo_terminfo.c and
+    demo_termcap.c to ensure that when building ncursest.map, etc., that
+    the corresponding names such as _nc_ttytype are added to the list of
+    versioned symbols (report by Werner Fink)
+  + fix regression from 20150704 (report/patch by Werner Fink).
+
+-------------------------------------------------------------------
+Mon Jul  6 13:37:05 UTC 2015 - werner@suse.de
+
+- Add ncurses patch 20150606 pre-release
+  + make ABI 6 the default by updates to dist.mk and VERSION, with the
+    intention that the existing ABI 5 should build as before using the
+    "--with-abi=5" option.
+  + regenerate ada- and man-html documentation.
+  + minor fixes to color- and util-manpages.
+  + fix a regression in Ada95/gen/Makefile.in, to handle special case of
+    Cygwin, which uses the broken-linker feature.
+  + amend fix for CF_NCURSES_CONFIG used in test/configure to assume that
+    ncurses package scripts work when present for cross-compiling, as the
+    lessor of two evils (cf: 20150530).
+  + add check in configure script to disallow conflicting options
+    "--with-termlib" and "--enable-term-driver".
+  + move defaults for "--disable-lp64" and "--with-versioned-syms" into
+    CF_ABI_DEFAULTS macro.
+- Add ncurses patch 20150613
+  + fix overflow warning for OSX with lib_baudrate.c (cf: 20010630).
+  + modify script used to generate map/sym files to mark 5.9.20150530 as
+    the last "5.9" version, and regenerated the files.  That makes the
+    files not use ".current" for the post-5.9 symbols.  This also
+    corrects the label for _nc_sigprocmask used in when weak symbols are
+    configured for the ncursest/ncursestw libraries (prompted by
+    discussion with Sven Joachim).
+  + fix typo in NEWS (report by Sven Joachim).
+- Add ncurses patch 20150627
+  + modify configure script to remove deprecated ABI 5 symbols when
+    building ABI 6.
+  + add symbols _nc_Default_Field, _nc_Default_Form, _nc_has_mouse to
+    map-files, but marked as deprecated so that they can easily be
+    suppressed from ABI 6 builds (Debian #788610).
+  + comment-out "screen.xterm" entry, and inherit screen.xterm-256color
+    from xterm-new (report by Richard Birkett) -TD
+  + modify read_entry.c to set the error-return to -1 if no terminal
+    databases were found, as documented for setupterm.
+  + add test_setupterm.c to demonstrate normal/error returns from the
+    setupterm and restartterm functions.
+  + amend cleanup change from 20110813 which removed redundant definition
+    of ret_error, etc., from tinfo_driver.c, to account for the fact that
+    it should return a bool rather than int (report/analysis by Johannes
+    Schindelin).
+- Add ncurses patch 20150704
+  + fix a few problems reported by Coverity.
+  + fix comparison against "/usr/include" in misc/gen-pkgconfig.in
+    (report by Daiki Ueno, Debian #790548, cf:  20141213).
+- Add tack patch 1.07.20150606
+  + Able to handle ncurses6 in configure
+
 -------------------------------------------------------------------
 Mon Jun  1 08:37:16 UTC 2015 - werner@suse.de
 

ncurses.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ncurses
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -43,33 +43,32 @@ BuildRequires:  gpm
 Obsoletes:      ncurses-64bit
 %endif
 #
-Version:        5.9
+Version:        6.0
 Release:        0
 Summary:        New curses Libraries
 License:        MIT
 Group:          System/Base
 #Git:           http://ncurses.scripts.mit.edu
 Url:            http://invisible-island.net/ncurses/ncurses.html
-Source0:        ncurses-%{version}.tar.bz2
+Source0:        ftp://invisible-island.net/ncurses/ncurses-6.0.tar.gz
-Source1:        ncurses-%{version}-patches.tar.bz2
+Source1:        ncurses-6.0-patches.tar.bz2
 Source2:        handle.linux
 Source3:        README.devel
 Source4:        ncurses-rpmlintrc
-Source5:        tack-1.07-20130713.tar.bz2
+Source5:        tack-1.07-20150606.tar.bz2
 Source6:        edit.sed
 Source7:        baselibs.conf
-Patch0:         ncurses-%{version}.dif
+Patch0:         ncurses-6.0.dif
 Patch1:         ncurses-5.9-ibm327x.dif
 Patch3:         ncurses-5.9-overwrite.dif
 Patch4:         ncurses-5.7-tack.dif
 Patch5:         ncurses-5.9-environment.dif
-Patch6:         ncurses-5.9-avoid-line-markers.dif
+Patch6:         ncurses-6.0-avoid-line-markers.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir /etc
 %global         _miscdir    %{_datadir}/misc
 %global         _incdir     %{_includedir}
 %global         root        %{_tmppath}/%{name}-%{version}-store
-%global         abi         %(ver=%{version}; echo ${ver%.*})
 
 %description
 As soon as a text application needs to directly control its output to
@@ -138,16 +137,13 @@ Authors:
     Thomas E. Dickey <dickey@invisible-island.net>
     Eric S. Raymond <esr@thyrsus.com>
 
-%if %abi == 5
-
 %package -n libncurses5
 Summary:        The New curses Libraries
 License:        MIT
 Group:          System/Libraries
 Requires:       terminfo-base
-Provides:       ncurses = %{version}
+Provides:       ncurses = 5.9
-Obsoletes:      ncurses < %{version}
+Obsoletes:      ncurses < 5.9
-Recommends:     ncurses-utils = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      ncurses-64bit
@@ -168,18 +164,13 @@ Authors:
     Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
     Pavel Curtis
 
-%endif
-
 %package -n libncurses6
 Summary:        The New curses Libraries
 License:        MIT
 Group:          System/Libraries
 Requires:       terminfo-base
-%if %abi == 5
-Provides:       ncurses = 6.0
-%else
 Provides:       ncurses = %{version}
-%endif
+Recommends:     ncurses-utils = %{version}
 
 %description -n libncurses6 
 The ncurses library is used by the most curses based terminal
@@ -222,13 +213,8 @@ License:        MIT
 Group:          Development/Libraries/C and C++
 Provides:       ncurses:%{_incdir}/ncurses.h
 Requires:       %{_bindir}/tack
+Requires:       libncurses6 = %{version}-%{release}
 Requires:       ncurses = %{version}-%{release}
-%if %abi >= 6
-Requires:       libncurses6 = %{version}-%{release}
-%else
-Requires:       libncurses5 = %{version}-%{release}
-Requires:       libncurses6 = %{version}-%{release}
-%endif
 # bug437293
 %ifarch ppc64
 Obsoletes:      ncurses-devel-64bit
@@ -271,7 +257,7 @@ Authors:
     Eric S. Raymond <esr@thyrsus.com>
 
 %prep
-%setup -q -n ncurses-%{version}
+%setup -q
 rm -fr tack
 rm -f  Ada95/src/terminal_interface-curses.adb
 rm -f  Ada95/src/library.gpr
@@ -448,19 +434,11 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 	--enable-colorfgbg	\
 	--enable-sp-funcs	\
 	--enable-interop	\
-%if %abi >= 6
 	--with-pthread		\
 	--enable-reentrant	\
 	--enable-ext-mouse	\
 	--disable-widec		\
 	--enable-ext-colors	\
-%else
-	--without-pthread	\
-	--disable-reentrant	\
-	--disable-ext-mouse	\
-	--disable-widec		\
-	--disable-ext-colors	\
-%endif
 	--enable-weak-symbols	\
 	--enable-wgetch-events	\
 	--enable-pthreads-eintr	\
@@ -478,11 +456,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 	--with-pc-suffix	\
 	--enable-pc-files	\
 %if %{with symversion}
-%if %abi >= 6
 	--with-versioned-syms=${PWD}/package/ncursest.map \
-%else
-	--with-versioned-syms=${PWD}/package/ncurses.map \
-%endif
 %endif
 %if %{with hasheddb}
 	--with-hashed-db	\
@@ -545,11 +519,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
     # must not use %jobs here (would lead to: ln: ncurses.h already exists)
     make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir}
     ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir}
-%if %abi >= 6
+    sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config
-    sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config
-%else
-    sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config
-%endif
     mkdir pc
     mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
     #
@@ -566,21 +536,22 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
     popd
     unset LD_LIBRARY_PATH
     test ! -L tack || rm -f tack
-%if %abi < 6
     make clean
-    #
-    # Now use --with-pthread for reentrant pthread support (abi > 5).
-    #
     > $SCREENLOG
     tail -q -s 0.5 -f $SCREENLOG & pid=$!
-    eval screen -L -D -m ./${c#*./} --with-pthread		\
+
-				    --enable-reentrant		\
+    #
-				    --enable-ext-mouse		\
+    # Now use --with-pthread for reentrant pthread support (abi == 5).
+    #
+    eval screen -L -D -m ./${c#*./} --with-abi-version=5	\
+				    --without-pthread		\
+				    --disable-reentrant		\
+				    --disable-ext-mouse		\
 				    --disable-widec		\
 				    --disable-ext-colors	\
 				    --disable-overwrite		\
 %if %{with symversion}
-				    --with-versioned-syms=${PWD}/package/ncursest.map \
+				    --with-versioned-syms=${PWD}/package/ncurses.map \
 %endif
 				    --without-progs
     sleep 1
@@ -589,31 +560,36 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
     cp fallback.c.build ncurses/fallback.c
     make -C c++ etip.h
     make %{?_smp_mflags}
-    sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncurses@" misc/gen-pkgconfig
+    sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@
+	     s@^(libdir=).show_libdir@\1%{_libdir}/ncurses5@
+	     s@^(includedir=).show_includedir@\1%{_incdir}/ncurses5@' misc/gen-pkgconfig
     # must not use %jobs here (would lead to: ln: ncurses.h already exists)
-    make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncurses libdir=%{_libdir}/ncurses6
+    make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses5 includesubdir=/ncurses libdir=%{_libdir}/ncurses5
-    ln -sf %{_incdir}/ncurses6/ncurses/{curses,ncurses,term}.h %{root}%{_incdir}/ncurses6/
+    ln -sf %{_incdir}/ncurses5/ncurses/{curses,ncurses,term}.h %{root}%{_incdir}/ncurses5/
-    sh %{S:6} --cflags "-I%{_incdir}/ncurses6/ncurses -I%{_incdir}/ncurses6" --libs "-L%{_libdir}/ncurses6 -lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config
+    sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses5/ncurses -I%{_incdir}/ncurses5" --libs "-L%{_libdir}/ncurses5 -lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config
     pushd man
-	sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1
+	sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses5-config.1
     popd
     for pc in %{root}%{_libdir}/pkgconfig/*.pc
     do
 	test -e "$pc" || break
 	base=${pc%%.pc}
 	base=${base##*/}
-	mv -f $pc pc/${base}6.pc
+	case "$base" in
+	tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@'   "$pc" ;;
+	*)   sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc"
+	esac
+	mv -f $pc pc/${base}5.pc
     done
-%endif
+
-    make clean
     #
     # Now use --enable-widec for UTF8/wide character support.
     # The libs with 16 bit wide characters are binary incompatible
     # to the normal 8bit wide character libs.
     #
+    make clean
     > $SCREENLOG
     tail -q -s 0.5 -f $SCREENLOG & pid=$!
-%if %abi >= 6
     eval screen -L -D -m ./${c#*./} --with-pthread		\
 				    --enable-reentrant		\
 				    --enable-ext-mouse		\
@@ -624,15 +600,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 				    --with-versioned-syms=${PWD}/package/ncursestw.map \
 %endif
 				    --without-progs
-%else
-    eval screen -L -D -m ./${c#*./} --disable-ext-mouse		\
-				    --enable-widec		\
-				    --disable-ext-colors	\
-%if %{with symversion}
-				    --with-versioned-syms=${PWD}/package/ncursesw.map \
-%endif
-				    --without-progs
-%endif
     sleep 1
     kill $pid
     find -name fallback.o | xargs -r rm -vf
@@ -641,34 +608,28 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
     make %{?_smp_mflags}
     # must not use %jobs here (would lead to: ln: ncurses.h already exists)
     make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncursesw libdir=%{_libdir}
-%if %abi >= 6
+    sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config
-    sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config
     pushd man
 	sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1
     popd
-%else
-    sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw5-config
-    pushd man
-	sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1
-    popd
-%endif
     rm -f %{root}%{_libdir}/pkgconfig/ti*.pc
     mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
-%if %abi < 6
+
+    #
+    # ABI == 5
+    #
     make clean
-    #
-    # Do both --enable-widec and --with-pthread (abi > 5).
-    #
     > $SCREENLOG
     tail -q -s 0.5 -f $SCREENLOG & pid=$!
-    eval screen -L -D -m ./${c#*./} --with-pthread		\
+    eval screen -L -D -m ./${c#*./} --with-abi-version=5	\
-				    --enable-reentrant		\
+				    --without-pthread		\
-				    --enable-ext-mouse		\
+				    --disable-reentrant		\
+				    --disable-ext-mouse		\
 				    --enable-widec		\
-				    --enable-ext-colors		\
+				    --disable-ext-colors	\
 				    --disable-overwrite		\
 %if %{with symversion}
-				    --with-versioned-syms=${PWD}/package/ncursestw.map \
+				    --with-versioned-syms=${PWD}/package/ncursesw.map \
 %endif
 				    --without-progs
     sleep 1
@@ -677,22 +638,30 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
     cp fallback.c.build ncurses/fallback.c
     make -C c++ etip.h
     make %{?_smp_mflags}
-    sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncursesw@" misc/gen-pkgconfig
+    sed -ri 's@^(LDFLAGS=)$@\1-L\\${libdir}@
+	     s@^(libdir=).show_libdir@\1%{_libdir}/ncurses5@
+	     s@^(includedir=).show_includedir@\1%{_incdir}/ncurses5/ncursesw@' misc/gen-pkgconfig
     # must not use %jobs here (would lead to: ln: ncurses.h already exists)
-    make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncursesw libdir=%{_libdir}/ncurses6
+    make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses5 includesubdir=/ncursesw libdir=%{_libdir}/ncurses5
-    sh %{S:6} --cflags "-I%{_incdir}/ncurses6/ncursesw -I%{_incdir}/ncurses6" --libs "-L%{_libdir}/ncurses6 -lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config
+    sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses5/ncursesw -I%{_incdir}/ncurses5" --libs "-L%{_libdir}/ncurses5 -lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw5-config
     pushd man
-	sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1
+	sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1
     popd
-    rm -f %{root}%{_libdir}/pkgconfig/ti*.pc
     for pc in %{root}%{_libdir}/pkgconfig/*.pc
     do
 	test -e "$pc" || break
 	base=${pc%%.pc}
 	base=${base##*/}
-	mv -f $pc pc/${base}6.pc
+	case "$base" in
+	tinfo) sed -ri 's@(includedir=/usr/include/ncurses5/ncurses)w.*@\1@' "$pc" ;;
+	tic)   sed -ri 's@(includedir=/usr/include/ncurses5/ncurses)w.*@\1@' "$pc" ;;
+	esac
+	case "$base" in
+	tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@'   "$pc" ;;
+	*)   sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc"
+	esac
+	mv -f $pc pc/${base}5.pc
     done
-%endif
 
 %install
     GZIP="-9"
@@ -706,7 +675,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 	    test   -e "${lib}" || continue
 	    mv "${lib}" %{buildroot}/%{_lib}/ || continue
 	done
-	for lib in %{buildroot}/%{_lib}/${model}.so.%{abi} ; do
+	for lib in %{buildroot}/%{_lib}/${model}.so.6 ; do
 	    test -e "${lib}" || continue
 	    test -L "${lib}" || continue
 	    lib=${lib#%{buildroot}}
@@ -715,7 +684,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 	    libncurses*)
 		rm -f ${lnk}
 		echo '/* GNU ld script */'			>  ${lnk}
-		echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk}
+		echo "INPUT(${lib} AS_NEEDED(-ltinfo -ldl))"	>> ${lnk}
 		;;
 	    *)	ln -sf ${lib} %{buildroot}%{_libdir}/${model}.so
 	    esac
@@ -729,13 +698,12 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
     chmod 0755 %{buildroot}/%{_lib}/lib*.so.*
     chmod 0755 %{buildroot}/%{_libdir}/lib*.so.*
     chmod a-x  %{buildroot}/%{_libdir}/lib*.a
-%if %abi < 6
+    if test -d %{buildroot}%{_libdir}/ncurses5 ; then
-    if test -d %{buildroot}%{_libdir}/ncurses6 ; then
+	mv %{buildroot}%{_libdir}/ncurses5/*.so.5*   %{buildroot}%{_libdir}/
-	mv %{buildroot}%{_libdir}/ncurses6/*.so.6*   %{buildroot}%{_libdir}/
+	for lib in %{buildroot}%{_libdir}/ncurses5/*.so
-	for lib in %{buildroot}%{_libdir}/ncurses6/*.so
 	do
 	    lnk=$lib
-	    lib=/%{_lib}/${lib##*/}.6
+	    lib=/%{_lib}/${lib##*/}.5
 	    case "${lib##*/}" in
 	    libncurses*)
 		rm -f "${lnk}"
@@ -757,27 +725,26 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 		test   -e "${lib}" || continue
 		mv "${lib}" %{buildroot}/%{_lib}/ || continue
 	    done
-	    for lib in %{buildroot}/%{_lib}/${model}.so.6 ; do
+	    for lib in %{buildroot}/%{_lib}/${model}.so.5 ; do
 		test -e "${lib}" || continue
 		test -L "${lib}" || continue
 		lib=${lib#%{buildroot}}
-		lnk=%{buildroot}%{_libdir}/ncurses6/${model}.so
+		lnk=%{buildroot}%{_libdir}/ncurses5/${model}.so
 		case "${lib##*/}" in
 		libncurses*)
 		    rm -f ${lnk}
 		    echo '/* GNU ld script */'		    >  ${lnk}
-		    echo 'SEARCH_DIR(%{_libdir}/ncurses6)'  >> ${lnk}
+		    echo 'SEARCH_DIR(%{_libdir}/ncurses5)'  >> ${lnk}
 		    echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk}
 		    ;;
-		*)  ln -sf ${lib} %{buildroot}%{_libdir}/ncurses6/${model}.so
+		*)  ln -sf ${lib} %{buildroot}%{_libdir}/ncurses5/${model}.so
 	    esac
 	    done
 	done
-	chmod 0755 %{buildroot}/%{_lib}/lib*.so.6*
+	chmod 0755 %{buildroot}/%{_lib}/lib*.so.5*
-	chmod 0755 %{buildroot}/%{_libdir}/lib*.so.6*
+	chmod 0755 %{buildroot}/%{_libdir}/lib*.so.5*
-	chmod a-x  %{buildroot}/%{_libdir}/ncurses6/lib*.a
+	chmod a-x  %{buildroot}/%{_libdir}/ncurses5/lib*.a
     fi
-%endif
     test -n "%{buildroot}" || ldconfig -N
     mkdir -p %{buildroot}%{_defaultdocdir}/ncurses
     bzip2 -c misc/terminfo.src > misc/terminfo.src.bz2
@@ -872,12 +839,10 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 	> extension.list
     rm -f %{buildroot}%{_prefix}/lib/terminfo
     mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/
-%if %abi < 6
 
 %post   -n libncurses5 -p /sbin/ldconfig
 
 %postun -n libncurses5 -p /sbin/ldconfig
-%endif
 
 %post   -n libncurses6 -p /sbin/ldconfig
 
@@ -894,6 +859,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 %files -n ncurses-utils
 %defattr(-,root,root)
 %{_bindir}/clear
+%{_bindir}/infocmp
 %{_bindir}/reset
 %{_bindir}/tabs
 %{_bindir}/toe
@@ -906,13 +872,11 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 %doc %{_mandir}/man1/tput.1.gz
 %doc %{_mandir}/man1/tset.1.gz
 %doc %{_mandir}/man5/*.gz
-%if %abi == 5
 
 %files -n libncurses5
 %defattr(-,root,root)
 /%{_lib}/lib*.so.5*
 %{_libdir}/lib*.so.5*
-%endif
 
 %files -n libncurses6
 %defattr(-,root,root)
@@ -925,22 +889,21 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 %doc %{_defaultdocdir}/ncurses/*
 %{_bindir}/ncurses*-config
 %{_bindir}/captoinfo
-%{_bindir}/infocmp
 %{_bindir}/infotocap
 %{_bindir}/tic
 %dir %{_incdir}/ncurses/
 %dir %{_incdir}/ncursesw/
-%dir %{_incdir}/ncurses6/
+%dir %{_incdir}/ncurses5/
-%dir %{_incdir}/ncurses6/ncurses/
+%dir %{_incdir}/ncurses5/ncurses/
-%dir %{_incdir}/ncurses6/ncursesw/
+%dir %{_incdir}/ncurses5/ncursesw/
 %{_incdir}/*.h
 %{_incdir}/ncurses*/*.h
 %{_incdir}/ncurses*/*/*.h
-%dir %{_libdir}/ncurses6/
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
-%{_libdir}/ncurses6/lib*.a
+%dir %{_libdir}/ncurses5/
-%{_libdir}/ncurses6/lib*.so
+%{_libdir}/ncurses5/lib*.a
+%{_libdir}/ncurses5/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %doc %{_mandir}/man1/*-config.1.gz
 %doc %{_mandir}/man1/captoinfo.1.gz

tack-1.07-20130713.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a64a318cf72e01ed1cbacdbb94e8db9f607f45c2382237e5247a499ea3021431
-size 155586

tack-1.07-20150606.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cffefd505dec486f4e9e9086f22042bc7b4abd169dfbfb27b54a91e15300e39f
+size 158694