[packages/gettext] up to 0.20.2

[atler]

commit 025b535bf04569a7674be61b2ea41c61260e685e
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Apr 21 00:50:40 2020 +0200

    up to 0.20.2

 gettext-libdir.patch | 70 +++++++++++++++++++++++++++-------------------------
 gettext.spec         |  8 +++---
 2 files changed, 40 insertions(+), 38 deletions(-)
---
diff --git a/gettext.spec b/gettext.spec
index d508fa1..496647e 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -44,12 +44,12 @@ Summary(ru.UTF-8):	Библиотеки и утилиты для поддерж
 Summary(tr.UTF-8):	Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):	Бібліотеки та утиліти для підтримки національних мов
 Name:		gettext
-Version:	0.20.1
-Release:	3
+Version:	0.20.2
+Release:	1
 License:	LGPL v2+ (libintl), GPL v3+ (tools)
 Group:		Development/Tools
 Source0:	http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
-# Source0-md5:	9ed9e26ab613b668e0026222a9c23639
+# Source0-md5:	0cf5f68338d5d941bbf9ac93b847310f
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-killkillkill.patch
 Patch3:		%{name}-libdir.patch
@@ -85,7 +85,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # adjust -f when needed (e.g. 0.18.3.x used ABI 0.18.3, 0.19.5.x uses full version)
 %define		intabi	%(echo %{version} | cut -d. -f1-3)
 # similarly for its data
-%define		dataver	%(echo %{version} | cut -d. -f1-2)
+%define		dataver	%(echo %{version} | cut -d. -f1-3)
 
 %description
 The GNU gettext package provides a set of tools and documentation for
diff --git a/gettext-libdir.patch b/gettext-libdir.patch
index 1e3086d..b6a5f5d 100644
--- a/gettext-libdir.patch
+++ b/gettext-libdir.patch
@@ -1,20 +1,21 @@
---- gettext-0.20.1/gettext-runtime/gnulib-m4/lib-prefix.m4.orig	2019-06-18 17:53:08.859806346 +0200
-+++ gettext-0.20.1/gettext-runtime/gnulib-m4/lib-prefix.m4	2019-06-18 18:56:16.922617983 +0200
-@@ -225,12 +225,14 @@
-                if test -d "$searchdir"; then
-                  case "$searchdir" in
-                    */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-+                   */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
-                    */../ | */.. )
-                      # Better ignore directories of this form. They are misleading.
-                      ;;
-                    *) searchdir=`cd "$searchdir" && pwd`
-                       case "$searchdir" in
-                         */lib64 ) acl_libdirstem=lib64 ;;
-+                        */libx32 ) acl_libdirstem=libx32 ;;
-                       esac ;;
-                  esac
-                fi
+--- gettext-0.20.2/gettext-runtime/gnulib-m4/lib-prefix.m4.orig	2020-04-21 00:29:38.614580831 +0200
++++ gettext-0.20.2/gettext-runtime/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
 --- gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-link.m4.orig	2016-06-11 14:59:32.000000000 +0200
 +++ gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-link.m4	2017-02-05 14:27:31.840415976 +0100
 @@ -370,7 +370,12 @@
@@ -30,23 +31,24 @@
              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
---- gettext-0.20.1/gettext-tools/gnulib-m4/lib-prefix.m4.orig	2016-06-11 14:59:32.000000000 +0200
-+++ gettext-0.20.1/gettext-tools/gnulib-m4/lib-prefix.m4	2017-02-05 14:26:12.237083553 +0100
-@@ -225,12 +225,14 @@
-                if test -d "$searchdir"; then
-                  case "$searchdir" in
-                    */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-+                   */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
-                    */../ | */.. )
-                      # Better ignore directories of this form. They are misleading.
-                      ;;
-                    *) searchdir=`cd "$searchdir" && pwd`
-                       case "$searchdir" in
-                         */lib64 ) acl_libdirstem=lib64 ;;
-+                        */libx32 ) acl_libdirstem=libx32 ;;
-                       esac ;;
-                  esac
-                fi
+--- gettext-0.20.2/gettext-tools/gnulib-m4/lib-prefix.m4.orig	2020-04-21 00:29:38.614580831 +0200
++++ gettext-0.20.2/gettext-tools/gnulib-m4/lib-prefix.m4	2020-04-21 00:45:17.754663042 +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
 --- gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-link.m4.orig	2016-06-11 14:59:32.000000000 +0200
 +++ gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-link.m4	2017-02-05 14:27:31.840415976 +0100
 @@ -370,7 +370,12 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gettext.git/commitdiff/025b535bf04569a7674be61b2ea41c61260e685e