From ea0f77f10faeb76784dda7d1ca58000f5012ddda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 13 Aug 2019 21:56:08 +0200 Subject: [PATCH] Update the sources accordingly to its native counter part (0.20.1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#1740721 Signed-off-by: Fabiano FidĂȘncio --- .gitignore | 1 + mingw-gettext.spec | 43 ++++++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 48631c7..2651bb2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ gettext-0.17.tar.gz /gettext-0.18.3.2.tar.gz /gettext-0.19.4.tar.gz /gettext-0.19.7.tar.gz +/gettext-0.20.1.tar.xz diff --git a/mingw-gettext.spec b/mingw-gettext.spec index eeaf6db..1c49251 100644 --- a/mingw-gettext.spec +++ b/mingw-gettext.spec @@ -1,13 +1,13 @@ %?mingw_package_header Name: mingw-gettext -Version: 0.19.7 -Release: 7%{?dist} +Version: 0.20.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: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz +Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.xz BuildArch: noarch @@ -72,14 +72,18 @@ Static version of the MinGW Windows Gettext library. %prep %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} @@ -122,10 +126,11 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw32_bindir}/gettext.sh %{mingw32_bindir}/gettextize %{mingw32_bindir}/libasprintf-0.dll -%{mingw32_bindir}/libgettextlib-0-19-7.dll +%{mingw32_bindir}/libgettextlib-0-20-1.dll %{mingw32_bindir}/libgettextpo-0.dll -%{mingw32_bindir}/libgettextsrc-0-19-7.dll +%{mingw32_bindir}/libgettextsrc-0-20-1.dll %{mingw32_bindir}/libintl-8.dll +%{mingw32_bindir}/libtextstyle-0.dll %{mingw32_bindir}/msg*.exe %{mingw32_bindir}/ngettext.exe %{mingw32_bindir}/recode-sr-latin.exe @@ -133,19 +138,25 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw32_includedir}/autosprintf.h %{mingw32_includedir}/gettext-po.h %{mingw32_includedir}/libintl.h +%{mingw32_includedir}/textstyle.h +%{mingw32_includedir}/textstyle/stdbool.h +%{mingw32_includedir}/textstyle/version.h +%{mingw32_includedir}/textstyle/woe32dll.h %{mingw32_libdir}/libasprintf.dll.a %{mingw32_libdir}/libgettextlib.dll.a %{mingw32_libdir}/libgettextpo.dll.a %{mingw32_libdir}/libgettextsrc.dll.a %{mingw32_libdir}/libintl.dll.a +%{mingw32_libdir}/libtextstyle.dll.a %{mingw32_datadir}/gettext/ -%{mingw32_datadir}/gettext-%{version}/ +%{mingw32_datadir}/gettext-0.20/ %{mingw32_datadir}/aclocal/*m4 %files -n mingw32-gettext-static %{mingw32_libdir}/libasprintf.a %{mingw32_libdir}/libgettextpo.a %{mingw32_libdir}/libintl.a +%{mingw32_libdir}/libtextstyle.a # Win64 %files -n mingw64-gettext -f mingw64-%{name}.lang @@ -156,10 +167,11 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw64_bindir}/gettext.sh %{mingw64_bindir}/gettextize %{mingw64_bindir}/libasprintf-0.dll -%{mingw64_bindir}/libgettextlib-0-19-7.dll +%{mingw64_bindir}/libgettextlib-0-20-1.dll %{mingw64_bindir}/libgettextpo-0.dll -%{mingw64_bindir}/libgettextsrc-0-19-7.dll +%{mingw64_bindir}/libgettextsrc-0-20-1.dll %{mingw64_bindir}/libintl-8.dll +%{mingw64_bindir}/libtextstyle-0.dll %{mingw64_bindir}/msg*.exe %{mingw64_bindir}/ngettext.exe %{mingw64_bindir}/recode-sr-latin.exe @@ -167,22 +179,31 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw64_includedir}/autosprintf.h %{mingw64_includedir}/gettext-po.h %{mingw64_includedir}/libintl.h +%{mingw64_includedir}/textstyle.h +%{mingw64_includedir}/textstyle/stdbool.h +%{mingw64_includedir}/textstyle/version.h +%{mingw64_includedir}/textstyle/woe32dll.h %{mingw64_libdir}/libasprintf.dll.a %{mingw64_libdir}/libgettextlib.dll.a %{mingw64_libdir}/libgettextpo.dll.a %{mingw64_libdir}/libgettextsrc.dll.a %{mingw64_libdir}/libintl.dll.a +%{mingw64_libdir}/libtextstyle.dll.a %{mingw64_datadir}/gettext/ -%{mingw64_datadir}/gettext-%{version}/ +%{mingw64_datadir}/gettext-0.20/ %{mingw64_datadir}/aclocal/*m4 %files -n mingw64-gettext-static %{mingw64_libdir}/libasprintf.a %{mingw64_libdir}/libgettextpo.a %{mingw64_libdir}/libintl.a +%{mingw64_libdir}/libtextstyle.a %changelog +* Tue Aug 13 2019 Fabiano FidĂȘncio - 0.20.1-1 +- Update the sources accordingly to its native counter part, rhbz#1740721 + * Thu Jul 25 2019 Fedora Release Engineering - 0.19.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 44028cd..778b436 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87c4ab267c4dce8a75db5d057bb3c92f gettext-0.19.7.tar.gz +SHA512 (gettext-0.20.1.tar.xz) = 82ffa5a28068272d0587262f8d9269f9629c601da5d122b6645c9c4cf98bfe4149df01bb58522ccf8fe25b931672e18551d7fb34de1cbf6a0463a87f9f8ee221