From 0cae9cc6825dc095dc3c4251a43e352123e017f71adc9ddba8a494230c9e977c Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 12 Jul 2021 07:56:42 +0000
Subject: [PATCH] Update to ncurses-6.2 patch 20210710

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=557
---
 ncurses-6.2-patches.tar.bz2 |  4 ++--
 ncurses-6.2.dif             | 38 ++++++++++++++++++-------------------
 ncurses-rpmlintrc           |  3 +++
 ncurses.changes             | 21 ++++++++++++++++++++
 ncurses.spec                |  3 ++-
 5 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2
index 35212d6..5003c15 100644
--- a/ncurses-6.2-patches.tar.bz2
+++ b/ncurses-6.2-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d690041025c95549f15fa480c452e7fa4ca8edaefa1e5b7c2f4d960e871561e2
-size 3069804
+oid sha256:ed00e05003a367ae41b1b88b4e74c06ef11ebfffddb534e231de4c82f47393ed
+size 3215438
diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif
index 8afe2d5..b111ae2 100644
--- a/ncurses-6.2.dif
+++ b/ncurses-6.2.dif
@@ -28,7 +28,7 @@
  #include <stdio.h>
  
  #if defined(__cplusplus)
-@@ -5650,12 +5650,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5783,12 +5783,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo "? missing rename for \$cf_source"
  		cf_target="\$cf_source"
  	fi
@@ -46,7 +46,7 @@
  	sed	-f "$cf_man_alias" \\
  CF_EOF
  
-@@ -5665,7 +5668,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5798,7 +5801,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -55,7 +55,7 @@
  CF_EOF
  fi
  
-@@ -5705,7 +5708,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5838,7 +5841,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -64,7 +64,7 @@
  CF_EOF
  fi
  
-@@ -5714,23 +5717,23 @@ case "$MANPAGE_FORMAT" in
+@@ -5847,23 +5850,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
@@ -94,7 +94,7 @@
  				for cf_alias in \$aliases
  				do
  					if test "\$section" = 1 ; then
-@@ -5739,7 +5742,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5872,7 +5875,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f "\$cf_alias\${suffix}" ; then
@@ -103,7 +103,7 @@
  							then
  								continue
  							fi
-@@ -5749,18 +5752,18 @@ CF_EOF
+@@ -5882,18 +5885,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -125,7 +125,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -5780,9 +5783,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5913,9 +5916,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test "\$verb" = removing ; then
@@ -138,7 +138,7 @@
  		)
  		test -d "\$cf_subdir\${section}" &&
  		test -n "\$aliases" && (
-@@ -5802,6 +5805,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5935,6 +5938,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -148,7 +148,7 @@
  done
 --- configure
 +++ configure	2021-06-07 07:18:38.420598827 +0000
-@@ -5850,7 +5850,7 @@ echo $ECHO_N "checking for an rpath opti
+@@ -5912,7 +5912,7 @@ echo $ECHO_N "checking for an rpath opti
  		fi
  		;;
  	(linux*|gnu*|k*bsd*-gnu|freebsd*)
@@ -157,7 +157,7 @@
  		;;
  	(openbsd[2-9].*|mirbsd*)
  		LD_RPATH_OPT="-Wl,-rpath,"
-@@ -7452,7 +7452,7 @@ echo "${ECHO_T}$with_pcre2" >&6
+@@ -7514,7 +7514,7 @@ echo "${ECHO_T}$with_pcre2" >&6
  
  if test "x$with_pcre2" != xno ; then
  	cf_with_pcre2_ok=no
@@ -166,7 +166,7 @@
  	do
  
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
-@@ -14573,12 +14573,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14635,12 +14635,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo "? missing rename for \$cf_source"
  		cf_target="\$cf_source"
  	fi
@@ -184,7 +184,7 @@
  	sed	-f "$cf_man_alias" \\
  CF_EOF
  
-@@ -14588,7 +14591,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14650,7 +14653,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -193,7 +193,7 @@
  CF_EOF
  fi
  
-@@ -14628,7 +14631,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14690,7 +14693,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -202,7 +202,7 @@
  CF_EOF
  fi
  
-@@ -14637,23 +14640,23 @@ case "$MANPAGE_FORMAT" in
+@@ -14699,23 +14702,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
@@ -232,7 +232,7 @@
  				for cf_alias in \$aliases
  				do
  					if test "\$section" = 1 ; then
-@@ -14662,7 +14665,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14724,7 +14727,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f "\$cf_alias\${suffix}" ; then
@@ -241,7 +241,7 @@
  							then
  								continue
  							fi
-@@ -14672,18 +14675,18 @@ CF_EOF
+@@ -14734,18 +14737,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -263,7 +263,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -14703,9 +14706,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14765,9 +14768,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test "\$verb" = removing ; then
@@ -276,7 +276,7 @@
  		)
  		test -d "\$cf_subdir\${section}" &&
  		test -n "\$aliases" && (
-@@ -14725,6 +14728,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14787,6 +14790,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -656,7 +656,7 @@
  ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
 --- ncurses/Makefile.in
 +++ ncurses/Makefile.in	2021-06-07 07:18:38.424598755 +0000
-@@ -230,7 +230,7 @@ $(DESTDIR)$(libdir) :
+@@ -240,7 +240,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
  ./fallback.c : $(tinfo)/MKfallback.sh
diff --git a/ncurses-rpmlintrc b/ncurses-rpmlintrc
index 6f274dd..44816f3 100644
--- a/ncurses-rpmlintrc
+++ b/ncurses-rpmlintrc
@@ -3,3 +3,6 @@ addFilter(".*shared-lib-calls-exit.*")
 addFilter(".*non-etc-or-var-file-marked-as-conffile.*")
 addFilter(".*macro-in-comment.*jobs.*")
 addFilter(".*W:.*no-version-in-last-changelog.*")
+addFilter(".*W:.*shared-lib-without-dependency-information.*/libtinfow\.so\..*")
+addFilter(".*W:.*shared-lib-without-dependency-information.*/libtinfow\.so\..*")
+addFilter(".*-devel-static.*:.*W:.*useless-provides.*-devel.*")
diff --git a/ncurses.changes b/ncurses.changes
index c1d38c7..f821815 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Jul 12 06:52:19 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20210710
+  + improve history section for tset manpage based on the 1BSD tarball,
+    which preceded BSD's SCCS checkins by more than three years.
+  + improve CF_XOPEN_CURSES macro used in test/configure (report by Urs
+    Jansen).
+  + further improvement of libtool configuration, adding a dependency of
+    the install.tic rule, etc., on the library in the build-tree.
+  + update config.sub
+
+-------------------------------------------------------------------
+Mon Jul  5 12:39:43 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20210703
+  + amend libtool configuration to add dependency for install.tic, etc.,
+    in ncurses/Makefile on the lower-level libraries.
+  + modify configure script to support ".PHONY" make program feature.
+- Correct offsets of patch ncurses-6.2.dif
+
 -------------------------------------------------------------------
 Mon Jul  5 09:58:53 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/ncurses.spec b/ncurses.spec
index 492528a..270a39e 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -128,7 +128,8 @@ Group:          System/Base
 Requires:       ncurses-utils >= %{version}
 
 %description -n ncurses-tests
-The ncurses based test programs
+The ncurses based test programs, that is a set of tools
+showing the features of the new curses libraries.
 
 %package -n terminfo-base
 Summary:        A terminal descriptions database