unbreak pkgconfig file; rel 2

$ pkg-config --cflags readline
Package termcap was not found in the pkg-config search path.
Perhaps you should add the directory containing `termcap.pc'
to the PKG_CONFIG_PATH environment variable
Package 'termcap', required by 'readline', not found

there was no TERMPCAP_PKG_CONFIG_LIB defined for our -ltinfow
customization and readline made fallback to termcap.
TERMPCAP_PKG_CONFIG_LIB ends up in Requires.private:
effectively requiring pc file. since pc file is provided only for
ncurses/ncursesw modify and rename tinfo patch to use ncursew
instead and require first ncurses version without separate libtinfo.

diff --git a/readline-termcap.patch b/readline-termcap.patch
new file mode 100644 (file)
index 0000000..8b829fc
--- /dev/null
+++ b/readline-termcap.patch
@@ -0,0 +1,34 @@
+--- readline-8.1/aclocal.m4.orig       2021-09-30 12:19:56.932608638 +0200
++++ readline-8.1/aclocal.m4    2021-09-30 12:20:55.982231142 +0200
+@@ -996,10 +996,10 @@
+ AC_CACHE_VAL(bash_cv_termcap_lib,
+ [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
+   [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
++                [AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw,
+     [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
+         [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
+           [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
+-                [AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw,
+                   bash_cv_termcap_lib=gnutermcap)])])])])])])
+ if test "X$_bash_needmsg" = "Xyes"; then
+ AC_MSG_CHECKING(which library has the termcap functions)
+@@ -1012,6 +1012,9 @@
+ elif test $bash_cv_termcap_lib = libtermcap && test -z "$prefer_curses"; then
+ TERMCAP_LIB=-ltermcap
+ TERMCAP_DEP=
++elif test $bash_cv_termcap_lib = libncursesw; then
++TERMCAP_LIB=-lncursesw
++TERMCAP_DEP=
+ elif test $bash_cv_termcap_lib = libtinfo; then
+ TERMCAP_LIB=-ltinfo
+ TERMCAP_DEP=
+--- readline-8.1/configure.ac.orig     2021-09-30 12:14:21.587987979 +0200
++++ readline-8.1/configure.ac  2021-09-30 12:21:23.945384363 +0200
+@@ -216,6 +216,7 @@
+ -ltinfo)  TERMCAP_PKG_CONFIG_LIB=tinfo ;;
+ -lcurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
+ -lncurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
++-lncursesw) TERMCAP_PKG_CONFIG_LIB=ncursesw ;;
+ -ltermcap) TERMCAP_PKG_CONFIG_LIB=termcap ;;
+ *) TERMCAP_PKG_CONFIG_LIB=termcap ;;
+ esac

diff --git a/readline-tinfo.patch b/readline-tinfo.patch
deleted file mode 100644 (file)
index f65ccdd..0000000
--- a/readline-tinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- readline-8.0/aclocal.m4~   2019-03-21 13:51:49.000000000 +0100
-+++ readline-8.0/aclocal.m4    2019-03-21 13:59:18.834253548 +0100
-@@ -959,7 +959,7 @@ fi
- AC_CACHE_VAL(bash_cv_termcap_lib,
- [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
-   [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
--    [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-+    [AC_CHECK_LIB(tinfow, tgetent, bash_cv_termcap_lib=libtinfo,
-         [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
-           [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
-                 [AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw,
---- readline-6.0/aclocal.m4~   2009-11-10 09:41:14.398817230 +0100
-+++ readline-6.0/aclocal.m4    2009-11-10 09:41:41.719436244 +0100
-@@ -972,7 +972,7 @@
- TERMCAP_LIB=-ltermcap
- TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libtinfo; then
--TERMCAP_LIB=-ltinfo
-+TERMCAP_LIB=-ltinfow
- TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libncurses; then
- TERMCAP_LIB=-lncurses

diff --git a/readline.spec b/readline.spec
index 87ea4e6202d328c888f1650aeed497ab527982ac..b59a00d7473b7fb32e99de1b31d27b38578425df 100644 (file)
--- a/readline.spec
+++ b/readline.spec
@@ -15,7 +15,7 @@ Summary(tr.UTF-8):    Terminalden satır okumak için kullanılan bir kitaplık
 Summary(uk.UTF-8):     Бібліотека для читання стрічок з терміналу
 Name:          readline
 Version:       %{ver}%{?patchlevel:.%{patchlevel}}
-Release:       1
+Release:       2
 License:       GPL v3+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/readline/%{name}-%{ver}.tar.gz
@@ -25,17 +25,16 @@ Patch0:             %{name}-shared.patch
 Patch1:                %{name}-info.patch
 Patch2:                %{name}-header.patch
 Patch3:                %{name}-lfs.patch
-Patch4:                %{name}-tinfo.patch
+Patch4:                %{name}-termcap.patch
 # Commits: http://git.savannah.gnu.org/cgit/readline.git/
 %patchset_source -f http://ftp.gnu.org/gnu/readline/readline-8.1-patches/readline81-%03g 1 %{patchlevel}
 URL:           http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: ncurses-devel >= 5.0
+BuildRequires: ncurses-devel >= 5.9-3
 BuildRequires: texinfo
 Requires(post,postun): /sbin/ldconfig
-# libtinfow.so.* must be on /
-Requires:      ncurses >= 5.7-18
+Requires:      ncurses >= 5.9-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -101,7 +100,7 @@ Summary(tr.UTF-8):  readline kitaplığını kullanan programlar yazmak için ger
 Summary(uk.UTF-8):     Файли, необхідні для розробки програм, що використовують бібліотеку readline
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      ncurses-devel >= 5.0
+Requires:      ncurses-devel >= 5.9-3
 
 %description devel
 The "readline" library will read a line from the terminal and return