- updated to 0.18.3

- added ac patch (fixes win32 vsnprintf variants detection)

diff --git a/crossmingw32-gettext.spec b/crossmingw32-gettext.spec
index 86fd6a349cd1a08141c70608a77732054515e30b..9d51e256bc4cf559730f3258c86401f4486b1202 100644 (file)
--- a/crossmingw32-gettext.spec
+++ b/crossmingw32-gettext.spec
@@ -9,14 +9,15 @@
 Summary:       gettext libraries - cross MinGW32 version
 Summary(pl.UTF-8):     Biblioteki gettext - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       0.18.2.1
-Release:       2
+Version:       0.18.3
+Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
 Source0:       http://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.gz
-# Source0-md5: 034c8103b14654ebd300fadac44d6f14
+# Source0-md5: 3fa4236c41b7e837355de144210207ec
 Patch0:                %{realname}-libintl_by_gcj.patch
 Patch1:                %{name}-kill_tools.patch
+Patch2:                %{realname}-ac.patch
 URL:           http://www.gnu.org/software/gettext/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.11
@@ -84,6 +85,7 @@ Biblioteki DLL gettext dla Windows.
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -132,9 +134,9 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc,gettext,locale,man}
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{{envsubst,gettext,ngettext}.exe,gettext.sh}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{doc,gettext,locale,man}
+%{__rm} -r $RPM_BUILD_ROOT%{_infodir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT

diff --git a/gettext-ac.patch b/gettext-ac.patch
new file mode 100644 (file)
index 0000000..3685d4d
--- /dev/null
+++ b/gettext-ac.patch
@@ -0,0 +1,11 @@
+--- gettext-0.18.3/gettext-runtime/m4/intl.m4.orig     2013-07-07 07:28:39.000000000 +0200
++++ gettext-0.18.3/gettext-runtime/m4/intl.m4  2013-07-10 17:47:31.440610841 +0200
+@@ -61,7 +61,7 @@
+ 
+   dnl Use the _snprintf function only if it is declared (because on NetBSD it
+   dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+-  AC_CHECK_DECLS([_snprintf _snwprintf], , , [#include <stdio.h>])
++  AC_CHECK_DECLS([_snprintf, _snwprintf], , , [#include <stdio.h>])
+ 
+   dnl Use the *_unlocked functions only if they are declared.
+   dnl (because some of them were defined without being declared in Solaris