From 3a71eb1c9e9b79e6fb7ff516c479551bf09c084e Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 20 Apr 2020 15:21:17 +0200
Subject: [PATCH] Update to 0.20.2

---
 .gitignore         |  1 +
 mingw-gettext.spec | 56 ++++++++++++++++++++++------------------------
 sources            |  2 +-
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2651bb2..b2f6b19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ gettext-0.17.tar.gz
 /gettext-0.19.4.tar.gz
 /gettext-0.19.7.tar.gz
 /gettext-0.20.1.tar.xz
+/gettext-0.20.2.tar.xz
diff --git a/mingw-gettext.spec b/mingw-gettext.spec
index 9c3f28c..bb18339 100644
--- a/mingw-gettext.spec
+++ b/mingw-gettext.spec
@@ -1,8 +1,8 @@
-%?mingw_package_header
+%{?mingw_package_header}
 
 Name:      mingw-gettext
-Version:   0.20.1
-Release:   3%{?dist}
+Version:   0.20.2
+Release:   1%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
@@ -73,46 +73,41 @@ Static version of the MinGW Windows Gettext library.
 %setup -q -n gettext-%{version}
 
 %build
-
-# Please, re-enable this when rebasing to the latest
-# upstream release. For 0.20.1, it had to be disabled
-# due to build issues.
-#    --enable-threads=win32
-
 %mingw_configure            \
     --disable-java          \
     --disable-native-java   \
     --disable-csharp        \
     --enable-static         \
+    --enable-threads=win32  \
     --without-emacs         \
     --disable-openmp
 %mingw_make %{?_smp_mflags}
 
 
 %install
-%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+%mingw_make_install DESTDIR=%{buildroot}
 
-rm -f $RPM_BUILD_ROOT%{mingw32_datadir}/locale/locale.alias
-rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/charset.alias
+rm -f %{buildroot}%{mingw32_datadir}/locale/locale.alias
+rm -f %{buildroot}%{mingw32_libdir}/charset.alias
 
-rm -f $RPM_BUILD_ROOT%{mingw64_datadir}/locale/locale.alias
-rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/charset.alias
+rm -f %{buildroot}%{mingw64_datadir}/locale/locale.alias
+rm -f %{buildroot}%{mingw64_libdir}/charset.alias
 
 # Remove documentation - already available in base gettext-devel.
-rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
-rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}
-rm -rf $RPM_BUILD_ROOT%{mingw32_infodir}
+rm -rf %{buildroot}%{mingw32_mandir}
+rm -rf %{buildroot}%{mingw32_docdir}
+rm -rf %{buildroot}%{mingw32_infodir}
 
-rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
-rm -rf $RPM_BUILD_ROOT%{mingw64_docdir}
-rm -rf $RPM_BUILD_ROOT%{mingw64_infodir}
+rm -rf %{buildroot}%{mingw64_mandir}
+rm -rf %{buildroot}%{mingw64_docdir}
+rm -rf %{buildroot}%{mingw64_infodir}
 
 # Drop some useless tools
-rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/gettext
-rm -rf $RPM_BUILD_ROOT%{mingw64_libdir}/gettext
+rm -rf %{buildroot}%{mingw32_libdir}/gettext
+rm -rf %{buildroot}%{mingw64_libdir}/gettext
 
 # Drop all .la files
-find $RPM_BUILD_ROOT -name "*.la" -delete
+find %{buildroot} -name "*.la" -delete
 
 %mingw_find_lang %{name} --all-name
 
@@ -126,9 +121,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_bindir}/gettext.sh
 %{mingw32_bindir}/gettextize
 %{mingw32_bindir}/libasprintf-0.dll
-%{mingw32_bindir}/libgettextlib-0-20-1.dll
+%{mingw32_bindir}/libgettextlib-0-20-2.dll
 %{mingw32_bindir}/libgettextpo-0.dll
-%{mingw32_bindir}/libgettextsrc-0-20-1.dll
+%{mingw32_bindir}/libgettextsrc-0-20-2.dll
 %{mingw32_bindir}/libintl-8.dll
 %{mingw32_bindir}/libtextstyle-0.dll
 %{mingw32_bindir}/msg*.exe
@@ -149,7 +144,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_libdir}/libintl.dll.a
 %{mingw32_libdir}/libtextstyle.dll.a
 %{mingw32_datadir}/gettext/
-%{mingw32_datadir}/gettext-0.20/
+%{mingw32_datadir}/gettext-%{version}/
 %{mingw32_datadir}/aclocal/*m4
 
 %files -n mingw32-gettext-static
@@ -167,9 +162,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw64_bindir}/gettext.sh
 %{mingw64_bindir}/gettextize
 %{mingw64_bindir}/libasprintf-0.dll
-%{mingw64_bindir}/libgettextlib-0-20-1.dll
+%{mingw64_bindir}/libgettextlib-0-20-2.dll
 %{mingw64_bindir}/libgettextpo-0.dll
-%{mingw64_bindir}/libgettextsrc-0-20-1.dll
+%{mingw64_bindir}/libgettextsrc-0-20-2.dll
 %{mingw64_bindir}/libintl-8.dll
 %{mingw64_bindir}/libtextstyle-0.dll
 %{mingw64_bindir}/msg*.exe
@@ -190,7 +185,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw64_libdir}/libintl.dll.a
 %{mingw64_libdir}/libtextstyle.dll.a
 %{mingw64_datadir}/gettext/
-%{mingw64_datadir}/gettext-0.20/
+%{mingw64_datadir}/gettext-%{version}/
 %{mingw64_datadir}/aclocal/*m4
 
 %files -n mingw64-gettext-static
@@ -201,6 +196,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Thu Apr 16 2020 Sandro Mani <manisandro@gmail.com> - 0.20.2-1
+- Update to 0.20.2
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 778b436..5075748 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gettext-0.20.1.tar.xz) = 82ffa5a28068272d0587262f8d9269f9629c601da5d122b6645c9c4cf98bfe4149df01bb58522ccf8fe25b931672e18551d7fb34de1cbf6a0463a87f9f8ee221
+SHA512 (gettext-0.20.2.tar.xz) = 08d20c659004a77e607af17df15f5ce9bd4fc0feca9436aa206b0cbd2516f9f0c98c7ee1faacf7ff429f9b0dd9de219947b300216887a60727602a688acabc82