From c5f21baca1925d45c2eba240b2009c1b5c857717 Mon Sep 17 00:00:00 2001
From: Konstantin Kostiuk <kkostiuk@redhat.com>
Date: Sun, 30 Jun 2024 11:37:51 +0300
Subject: [PATCH] Bump to 0.22.5

Resolves: RHEL-45582

Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 .gitignore          |  1 +
 gettext-gcc14.patch | 17 +++++++++++++++++
 mingw-gettext.spec  | 23 ++++++++++++++++-------
 sources             |  2 +-
 4 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 gettext-gcc14.patch

diff --git a/.gitignore b/.gitignore
index bf7a0a5..211162d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ gettext-0.17.tar.gz
 /gettext-0.21.tar.xz
 /gettext-0.21.1.tar.xz
 /gettext-0.22.tar.xz
+/gettext-0.22.5.tar.xz
diff --git a/gettext-gcc14.patch b/gettext-gcc14.patch
new file mode 100644
index 0000000..972384c
--- /dev/null
+++ b/gettext-gcc14.patch
@@ -0,0 +1,17 @@
+diff -rupN gettext-0.22.5/gettext-tools/gnulib-lib/localtime.c gettext-0.22.5-new/gettext-tools/gnulib-lib/localtime.c
+--- gettext-0.22.5/gettext-tools/gnulib-lib/localtime.c	2024-02-21 11:44:25.000000000 +0100
++++ gettext-0.22.5-new/gettext-tools/gnulib-lib/localtime.c	2024-03-04 18:04:45.369463219 +0100
+@@ -63,11 +63,11 @@ rpl_localtime (const time_t *tp)
+       char **env = _environ;
+       wchar_t **wenv = _wenviron;
+       if (env != NULL)
+-        for (char *s = env; *s != NULL; s++)
++        for (char *s = *env; *s != NULL; s++)
+           if (s[0] == 'T' && s[1] == 'Z' && s[2] == '=')
+             s[0] = '$';
+       if (wenv != NULL)
+-        for (wchar_t *ws = wenv; *ws != NULL; ws++)
++        for (wchar_t *ws = *wenv; *ws != NULL; ws++)
+           if (ws[0] == L'T' && ws[1] == L'Z' && ws[2] == L'=')
+             ws[0] = L'$';
+     }
diff --git a/mingw-gettext.spec b/mingw-gettext.spec
index d76af31..c841384 100644
--- a/mingw-gettext.spec
+++ b/mingw-gettext.spec
@@ -1,13 +1,15 @@
 %{?mingw_package_header}
 
 Name:      mingw-gettext
-Version:   0.22
-Release:   6%{?dist}
+Version:   0.22.5
+Release:   1%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPL-2.0-or-later AND LGPL-2.0-or-later
 URL:       http://www.gnu.org/software/gettext/
 Source0:   https://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.xz
+# Fix build with gcc14
+Patch0:    gettext-gcc14.patch
 
 BuildArch: noarch
 
@@ -107,8 +109,12 @@ rm -rf %{buildroot}%{mingw64_infodir}
 rm -rf %{buildroot}%{mingw32_libdir}/gettext
 rm -rf %{buildroot}%{mingw64_libdir}/gettext
 
-# Drop all .la files
+# Drop all .la files and .a files
 find %{buildroot} -name "*.la" -delete
+rm %{buildroot}%{mingw32_libdir}/libgettextlib.a
+rm %{buildroot}%{mingw32_libdir}/libgettextsrc.a
+rm %{buildroot}%{mingw64_libdir}/libgettextlib.a
+rm %{buildroot}%{mingw64_libdir}/libgettextsrc.a
 
 %mingw_find_lang %{name} --all-name
 
@@ -122,9 +128,9 @@ find %{buildroot} -name "*.la" -delete
 %{mingw32_bindir}/gettext.sh
 %{mingw32_bindir}/gettextize
 %{mingw32_bindir}/libasprintf-0.dll
-%{mingw32_bindir}/libgettextlib-0-22.dll
+%{mingw32_bindir}/libgettextlib-0-22-5.dll
 %{mingw32_bindir}/libgettextpo-0.dll
-%{mingw32_bindir}/libgettextsrc-0-22.dll
+%{mingw32_bindir}/libgettextsrc-0-22-5.dll
 %{mingw32_bindir}/libintl-8.dll
 %{mingw32_bindir}/libtextstyle-0.dll
 %{mingw32_bindir}/msg*.exe
@@ -163,9 +169,9 @@ find %{buildroot} -name "*.la" -delete
 %{mingw64_bindir}/gettext.sh
 %{mingw64_bindir}/gettextize
 %{mingw64_bindir}/libasprintf-0.dll
-%{mingw64_bindir}/libgettextlib-0-22.dll
+%{mingw64_bindir}/libgettextlib-0-22-5.dll
 %{mingw64_bindir}/libgettextpo-0.dll
-%{mingw64_bindir}/libgettextsrc-0-22.dll
+%{mingw64_bindir}/libgettextsrc-0-22-5.dll
 %{mingw64_bindir}/libintl-8.dll
 %{mingw64_bindir}/libtextstyle-0.dll
 %{mingw64_bindir}/msg*.exe
@@ -197,6 +203,9 @@ find %{buildroot} -name "*.la" -delete
 
 
 %changelog
+* Sun Jun 30 2024 Konstantin Kostiuk <kkostiuk@redhat.com> - 0.22.5-1
+- RHEL-45582 - Bump to 0.22.5
+
 * Fri Jun 28 2024 Konstantin Kostiuk <kkostiuk@redhat.com> - 0.22-6
 - Bump release
 - RHEL-45467 - Update gating.yaml for RHEL10
diff --git a/sources b/sources
index 6106f7b..4c4043c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gettext-0.22.tar.xz) = c6368344aa4e0f6fd7c4a93023a5f7b377c7bb97b8ea688fd54f4c385c069d9ff27611d8763b1aed6328b6d3c4db7b34bd89bfbf6525ecaef11eb58434a4d4fa
+SHA512 (gettext-0.22.5.tar.xz) = a60999bb9d09441f138214d87acb7e59aab81e765bb9253a77c54902681c5de164a5a04de2a9778dfb479dbdefaab2d5de1fbaf6095c555c43e7e9fd7a1c09bd