From 01821e9e5e68ea7df24a65e3a685bdae8ae46915 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 20 Oct 2022 14:59:45 +0200
Subject: [PATCH] Update to 0.21.1

---
 .gitignore                      |  1 +
 gettext-printf_collision.patch  | 20 --------------------
 gettext_formatstring-ruby.patch | 11 -----------
 mingw-gettext.spec              | 19 +++++++++----------
 sources                         |  2 +-
 5 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 gettext-printf_collision.patch
 delete mode 100644 gettext_formatstring-ruby.patch

diff --git a/.gitignore b/.gitignore
index 952d23b..e330038 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ gettext-0.17.tar.gz
 /gettext-0.20.1.tar.xz
 /gettext-0.20.2.tar.xz
 /gettext-0.21.tar.xz
+/gettext-0.21.1.tar.xz
diff --git a/gettext-printf_collision.patch b/gettext-printf_collision.patch
deleted file mode 100644
index 18fcee2..0000000
--- a/gettext-printf_collision.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rupN --no-dereference gettext-0.21/gettext-runtime/intl/libgnuintl.in.h gettext-0.21-new/gettext-runtime/intl/libgnuintl.in.h
---- gettext-0.21/gettext-runtime/intl/libgnuintl.in.h	2020-07-26 22:13:34.000000000 +0200
-+++ gettext-0.21-new/gettext-runtime/intl/libgnuintl.in.h	2020-08-03 11:57:20.495613456 +0200
-@@ -431,6 +431,7 @@ extern int vasprintf (char **, const cha
- #endif
- 
- #if @HAVE_WPRINTF@
-+#ifndef __cplusplus
- 
- #undef fwprintf
- #define fwprintf libintl_fwprintf
-@@ -455,6 +456,8 @@ extern int vswprintf (wchar_t *, size_t,
- 
- #endif
- 
-+#endif
-+
- #endif
- 
- 
diff --git a/gettext_formatstring-ruby.patch b/gettext_formatstring-ruby.patch
deleted file mode 100644
index d3a60dd..0000000
--- a/gettext_formatstring-ruby.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN gettext-0.21/gettext-tools/woe32dll/gettextsrc-exports.c gettext-0.21-new/gettext-tools/woe32dll/gettextsrc-exports.c
---- gettext-0.21/gettext-tools/woe32dll/gettextsrc-exports.c	2019-12-23 12:21:12.000000000 +0100
-+++ gettext-0.21-new/gettext-tools/woe32dll/gettextsrc-exports.c	2020-08-03 14:22:17.096473605 +0200
-@@ -50,6 +50,7 @@ VARIABLE(formatstring_python)
- VARIABLE(formatstring_python_brace)
- VARIABLE(formatstring_qt)
- VARIABLE(formatstring_qt_plural)
-+VARIABLE(formatstring_ruby)
- VARIABLE(formatstring_scheme)
- VARIABLE(formatstring_sh)
- VARIABLE(formatstring_smalltalk)
diff --git a/mingw-gettext.spec b/mingw-gettext.spec
index 65b4919..407976f 100644
--- a/mingw-gettext.spec
+++ b/mingw-gettext.spec
@@ -1,17 +1,13 @@
 %{?mingw_package_header}
 
 Name:      mingw-gettext
-Version:   0.21
-Release:   6%{?dist}
+Version:   0.21.1
+Release:   1%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.gnu.org/software/gettext/
 Source0:   https://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.xz
-# Don't override various *printf macros in C++, they collide with the std::xxx counterparts
-Patch0:   gettext-printf_collision.patch
-# Add missing symbol export
-Patch1:    gettext_formatstring-ruby.patch
 
 BuildArch: noarch
 
@@ -126,9 +122,9 @@ find %{buildroot} -name "*.la" -delete
 %{mingw32_bindir}/gettext.sh
 %{mingw32_bindir}/gettextize
 %{mingw32_bindir}/libasprintf-0.dll
-%{mingw32_bindir}/libgettextlib-0-21.dll
+%{mingw32_bindir}/libgettextlib-0-21-1.dll
 %{mingw32_bindir}/libgettextpo-0.dll
-%{mingw32_bindir}/libgettextsrc-0-21.dll
+%{mingw32_bindir}/libgettextsrc-0-21-1.dll
 %{mingw32_bindir}/libintl-8.dll
 %{mingw32_bindir}/libtextstyle-0.dll
 %{mingw32_bindir}/msg*.exe
@@ -167,9 +163,9 @@ find %{buildroot} -name "*.la" -delete
 %{mingw64_bindir}/gettext.sh
 %{mingw64_bindir}/gettextize
 %{mingw64_bindir}/libasprintf-0.dll
-%{mingw64_bindir}/libgettextlib-0-21.dll
+%{mingw64_bindir}/libgettextlib-0-21-1.dll
 %{mingw64_bindir}/libgettextpo-0.dll
-%{mingw64_bindir}/libgettextsrc-0-21.dll
+%{mingw64_bindir}/libgettextsrc-0-21-1.dll
 %{mingw64_bindir}/libintl-8.dll
 %{mingw64_bindir}/libtextstyle-0.dll
 %{mingw64_bindir}/msg*.exe
@@ -201,6 +197,9 @@ find %{buildroot} -name "*.la" -delete
 
 
 %changelog
+* Thu Oct 20 2022 Sandro Mani <manisandro@gmail.com> - 0.21.1-1
+- Update to 0.21.1
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.21-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index bfe361b..aa3a28a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gettext-0.21.tar.xz) = f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
+SHA512 (gettext-0.21.1.tar.xz) = 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9