From e41f1a406b8ffe80280e577467cde3289dd37343 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 13 Jul 2013 21:12:28 +0200 Subject: [PATCH] Update to 0.18.3 --- .gitignore | 1 + gettext-use-proper-cdecl.patch | 33 --------------------------------- mingw-gettext.spec | 20 ++++++++++---------- sources | 2 +- 4 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 gettext-use-proper-cdecl.patch diff --git a/.gitignore b/.gitignore index b7dd72d..e007c67 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gettext-0.17.tar.gz /gettext-0.18.1.1.tar.gz /gettext-0.18.2.tar.gz /gettext-0.18.2.1.tar.gz +/gettext-0.18.3.tar.gz diff --git a/gettext-use-proper-cdecl.patch b/gettext-use-proper-cdecl.patch deleted file mode 100644 index de9576d..0000000 --- a/gettext-use-proper-cdecl.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- gettext-runtime/gnulib-lib/msvc-inval.c.orig 2013-06-15 18:01:47.658316614 +0200 -+++ gettext-runtime/gnulib-lib/msvc-inval.c 2013-06-15 18:01:51.492348702 +0200 -@@ -28,7 +28,7 @@ - - # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING - --static void cdecl -+static void __cdecl - gl_msvc_invalid_parameter_handler (const wchar_t *expression, - const wchar_t *function, - const wchar_t *file, ---- gettext-tools/gnulib-lib/msvc-inval.c.orig 2013-06-15 18:02:11.335514821 +0200 -+++ gettext-tools/gnulib-lib/msvc-inval.c 2013-06-15 18:02:20.387590641 +0200 -@@ -28,7 +28,7 @@ - - # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING - --static void cdecl -+static void __cdecl - gl_msvc_invalid_parameter_handler (const wchar_t *expression, - const wchar_t *function, - const wchar_t *file, ---- gettext-tools/libgettextpo/msvc-inval.c.orig 2013-06-15 18:02:25.814636031 +0200 -+++ gettext-tools/libgettextpo/msvc-inval.c 2013-06-15 18:02:31.912687078 +0200 -@@ -28,7 +28,7 @@ - - # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING - --static void cdecl -+static void __cdecl - gl_msvc_invalid_parameter_handler (const wchar_t *expression, - const wchar_t *function, - const wchar_t *file, diff --git a/mingw-gettext.spec b/mingw-gettext.spec index aa4385f..afe1a53 100644 --- a/mingw-gettext.spec +++ b/mingw-gettext.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-gettext -Version: 0.18.2.1 -Release: 3%{?dist} +Version: 0.18.3 +Release: 1%{?dist} Summary: GNU libraries and utilities for producing multi-lingual messages License: GPLv2+ and LGPLv2+ @@ -33,9 +33,6 @@ BuildRequires: mingw64-termcap #BuildRequires: mingw32-expat #BuildRequires: mingw32-glib2 -# Fix FTBFS due to invalid use of cdecl (__cdecl should be used instead) -Patch0: gettext-use-proper-cdecl.patch - %description MinGW Windows Gettext library @@ -77,7 +74,6 @@ Static version of the MinGW Windows Gettext library. %prep %setup -q -n gettext-%{version} -%patch0 -p0 %build @@ -129,9 +125,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw32_bindir}/gettext.sh %{mingw32_bindir}/gettextize %{mingw32_bindir}/libasprintf-0.dll -%{mingw32_bindir}/libgettextlib-0-18-2.dll +%{mingw32_bindir}/libgettextlib-0-18-3.dll %{mingw32_bindir}/libgettextpo-0.dll -%{mingw32_bindir}/libgettextsrc-0-18-2.dll +%{mingw32_bindir}/libgettextsrc-0-18-3.dll %{mingw32_bindir}/libintl-8.dll %{mingw32_bindir}/msg*.exe %{mingw32_bindir}/ngettext.exe @@ -162,9 +158,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw64_bindir}/gettext.sh %{mingw64_bindir}/gettextize %{mingw64_bindir}/libasprintf-0.dll -%{mingw64_bindir}/libgettextlib-0-18-2.dll +%{mingw64_bindir}/libgettextlib-0-18-3.dll %{mingw64_bindir}/libgettextpo-0.dll -%{mingw64_bindir}/libgettextsrc-0-18-2.dll +%{mingw64_bindir}/libgettextsrc-0-18-3.dll %{mingw64_bindir}/libintl-8.dll %{mingw64_bindir}/msg*.exe %{mingw64_bindir}/ngettext.exe @@ -188,6 +184,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Sat Jul 13 2013 Erik van Pienbroek - 0.18.3-1 +- Update to 0.18.3 +- Dropped upstreamed patch + * Sat Jun 15 2013 Erik van Pienbroek - 0.18.2.1-3 - Fix FTBFS due to invalid use of cdecl diff --git a/sources b/sources index 99fdeb9..836d81a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -034c8103b14654ebd300fadac44d6f14 gettext-0.18.2.1.tar.gz +3fa4236c41b7e837355de144210207ec gettext-0.18.3.tar.gz