From b6595fbfe9296d7726bd92be8c4e84669faa4908 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Jan 04 2013 12:30:38 +0000 Subject: Update to 0.18.2 and removed all hacks as they're not needed any more --- diff --git a/.gitignore b/.gitignore index 0927f81..0dc11df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ gettext-0.17.tar.gz /gettext-0.18.1.1.tar.gz +/gettext-0.18.2.tar.gz diff --git a/mingw-gettext.spec b/mingw-gettext.spec index 8f7e628..88c9950 100644 --- a/mingw-gettext.spec +++ b/mingw-gettext.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-gettext -Version: 0.18.1.1 -Release: 11%{?dist} +Version: 0.18.2 +Release: 1%{?dist} Summary: GNU libraries and utilities for producing multi-lingual messages License: GPLv2+ and LGPLv2+ @@ -10,9 +10,6 @@ Group: Development/Libraries URL: http://www.gnu.org/software/gettext/ Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz -# Fix compatibility with mingw-w64 -Patch0: gettext-0.18.1.1-tml.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -29,9 +26,6 @@ BuildRequires: mingw64-binutils BuildRequires: mingw64-win-iconv BuildRequires: mingw64-termcap -# The libtool bundled with this package is too old for win64 support -BuildRequires: autoconf automake libtool - # Possible extra BRs. These are used if available, but # not required just for building. #BuildRequires: mingw32-dlfcn @@ -80,22 +74,9 @@ Static version of the MinGW Windows Gettext library. %prep %setup -q -n gettext-%{version} -%patch0 -p0 - -# The libtool bundled with this package is too old for win64 support -autoreconf -i --force %build -# Some build workarounds -export gl_cv_func_memchr_works="yes" -export ac_cv_func_strnlen_working="yes" - -# The libtool on RHEL6 is too old for win64 support -%if 0%{?rhel} == 6 -export lt_cv_deplibs_check_method="pass_all" -%endif - %mingw_configure \ --disable-java \ --disable-native-java \ @@ -144,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-1.dll +%{mingw32_bindir}/libgettextlib-0-18-2.dll %{mingw32_bindir}/libgettextpo-0.dll -%{mingw32_bindir}/libgettextsrc-0-18-1.dll +%{mingw32_bindir}/libgettextsrc-0-18-2.dll %{mingw32_bindir}/libintl-8.dll %{mingw32_bindir}/msg*.exe %{mingw32_bindir}/ngettext.exe @@ -177,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-1.dll +%{mingw64_bindir}/libgettextlib-0-18-2.dll %{mingw64_bindir}/libgettextpo-0.dll -%{mingw64_bindir}/libgettextsrc-0-18-1.dll +%{mingw64_bindir}/libgettextsrc-0-18-2.dll %{mingw64_bindir}/libintl-8.dll %{mingw64_bindir}/msg*.exe %{mingw64_bindir}/ngettext.exe @@ -203,6 +184,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Fri Jan 4 2013 Erik van Pienbroek - 0.18.2-1 +- Update to 0.18.2 +- Removed all hacks as they're not needed any more + * Thu Dec 6 2012 Erik van Pienbroek - 0.18.1.1-11 - Fix the build on RHEL6 (too old libtool) - Minor cleanup diff --git a/sources b/sources index 68183b4..7e415a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3dd55b952826d2b32f51308f2f91aa89 gettext-0.18.1.1.tar.gz +0c86e5af70c195ab8bd651d17d783928 gettext-0.18.2.tar.gz