[packages/libtextstyle] - replaced LTLIBTERMINFO hack with libdir patch (adapted from gettext-libdir.patch)

[qboosh]

commit af3518ff801e3eb6ad911a1a5f38be56bf4e106d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 25 08:50:39 2020 +0200

    - replaced LTLIBTERMINFO hack with libdir patch (adapted from gettext-libdir.patch)

 libtextstyle-libdir.patch | 33 +++++++++++++++++++++++++++++++++
 libtextstyle.spec         |  6 +++---
 2 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/libtextstyle.spec b/libtextstyle.spec
index f94938c..d58ff80 100644
--- a/libtextstyle.spec
+++ b/libtextstyle.spec
@@ -11,6 +11,7 @@ License:	GPL v3+
 Group:		Libraries
 Source0:	http://alpha.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 # Source0-md5:	30be56f2428ff2add624caf3a1700d3e
+Patch0:		%{name}-libdir.patch
 URL:		https://www.gnu.org/software/gettext/libtextstyle/manual/
 BuildRequires:	make >= 3.79.1
 BuildRequires:	ncurses-devel
@@ -60,6 +61,7 @@ Statyczna biblioteka libtextstyle.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -67,9 +69,7 @@ Statyczna biblioteka libtextstyle.
 	--disable-silent-rules \
 	%{!?with_static_libs:--disable-static}
 
-# pass LTLIBTERMINFO to drop unwanted -L...
-%{__make} \
-	LTLIBTERMINFO="-lncurses"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/libtextstyle-libdir.patch b/libtextstyle-libdir.patch
new file mode 100644
index 0000000..5bd5d7b
--- /dev/null
+++ b/libtextstyle-libdir.patch
@@ -0,0 +1,33 @@
+--- libtextstyle-0.20.5/gnulib-m4/lib-prefix.m4.orig	2020-04-21 00:29:38.614580831 +0200
++++ libtextstyle-0.20.5/gnulib-m4/lib-prefix.m4	2020-04-21 00:42:56.945602835 +0200
+@@ -283,6 +283,7 @@
+                case "$searchdir" in
+                  */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;;
+                  */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;;
++                 */libx32/ | */libx32 ) acl_libdirstem3=libx32 ;;
+                  */../ | */.. )
+                    # Better ignore directories of this form. They are misleading.
+                    ;;
+@@ -290,6 +291,7 @@
+                     case "$searchdir" in
+                       */lib32 ) acl_libdirstem2=lib32 ;;
+                       */lib64 ) acl_libdirstem3=lib64 ;;
++                      */libx32 ) acl_libdirstem3=libx32 ;;
+                     esac ;;
+                esac
+              fi
+--- libtextstyle-0.20.5/gnulib-m4/lib-link.m4.orig	2016-06-11 14:59:32.000000000 +0200
++++ libtextstyle-0.20.5/gnulib-m4/lib-link.m4	2017-02-05 14:27:31.840415976 +0100
+@@ -370,7 +370,12 @@
+           fi
+           if test "X$found_dir" != "X"; then
+             dnl Found the library.
++
++            if test "X$found_dir" = "X/usr/$acl_libdirstem" || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
++            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
++            else
+             LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
++            fi
+             if test "X$found_so" != "X"; then
+               dnl Linking with a shared library. We attempt to hardcode its
+               dnl directory into the executable's runpath, unless it's the
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libtextstyle.git/commitdiff/af3518ff801e3eb6ad911a1a5f38be56bf4e106d