- updated to 0.18.3.1

[packages/crossmingw32-gettext.git] / crossmingw32-gettext.spec

diff --git a/crossmingw32-gettext.spec b/crossmingw32-gettext.spec
index e971a1ca612c2fd894b54717daf130a1048eb157..68edf76fd3d01cb0362bdb75227a34a90a7354fd 100644 (file)
--- a/crossmingw32-gettext.spec
+++ b/crossmingw32-gettext.spec
@@ -1,27 +1,20 @@
-#
-%bcond_with     bootstrap       # use system GLib
-#
-Summary:       gettext libraries - cross mingw32 version
-Summary(pl.UTF-8):     Biblioteki gettext - wersja skrośna dla mingw32
 %define                realname                gettext
+Summary:       gettext libraries - cross MinGW32 version
+Summary(pl.UTF-8):     Biblioteki gettext - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       0.17
+Version:       0.18.3.1
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
 Source0:       http://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.gz
-# Source0-md5: 58a2bc6d39c0ba57823034d55d65d606
-Patch0:                %{realname}-info.patch
-Patch1:                %{realname}-libintl_by_gcj.patch
-Patch2:                %{realname}-removed_macros.patch
-Patch3:                %{name}-kill_tools.patch
+# Source0-md5: 3fc808f7d25487fc72b5759df7419e02
+Patch0:                %{realname}-libintl_by_gcj.patch
+Patch1:                %{name}-kill_tools.patch
 URL:           http://www.gnu.org/software/gettext/
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.10
+BuildRequires: autoconf >= 2.62
+BuildRequires: automake >= 1:1.11
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-gcc-c++
-# just to shorten build (libgettextlib is not packaged anyway)
-%{!?with_bootstrap:BuildRequires:      crossmingw32-glib2 >= 2.0}
 BuildRequires: crossmingw32-libiconv
 BuildRequires: libtool
 BuildRequires: texinfo
@@ -40,24 +33,32 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
+%define                _ssp_cflags             %{nil}
+
+%ifnarch %{ix86}
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
+%define                optflags        -O2
+%endif
+# -z options are invalid for mingw linker
+%define                filterout_ld    -Wl,-z,.*
 
 %description
-gettext libraries - cross mingw32 version.
+gettext libraries - cross MinGW32 version.
 
 %description -l pl.UTF-8
-Biblioteki gettext - wersja skrośna dla mingw32.
+Biblioteki gettext - wersja skrośna dla MinGW32.
 
 %package static
-Summary:       Static gettext libraries (cross mingw32 version)
-Summary(pl.UTF-8):     Statyczne biblioteki gettext (wersja skrośna mingw32)
+Summary:       Static gettext libraries (cross MinGW32 version)
+Summary(pl.UTF-8):     Statyczne biblioteki gettext (wersja skrośna MinGW32)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description static
-Static gettext libraries (cross mingw32 version).
+Static gettext libraries (cross MinGW32 version).
 
 %description static -l pl.UTF-8
-Statyczne biblioteki gettext (wersja skrośna mingw32).
+Statyczne biblioteki gettext (wersja skrośna MinGW32).
 
 %package dll
 Summary:       DLL gettext libraries for Windows
@@ -76,39 +77,39 @@ Biblioteki DLL gettext dla Windows.
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
-cd autoconf-lib-link
-%{__aclocal} -I m4 -I ../m4
-%{__autoconf}
-%{__automake}
-cd ../gettext-runtime
+cd gettext-runtime
 %{__libtoolize}
-%{__aclocal} -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
+%{__aclocal} -I m4 -I ../m4 -I gnulib-m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 cd libasprintf
-%{__aclocal} -I ../m4 -I ../../m4
+%{__aclocal} -I ../../m4 -I ../m4 -I gnulib-m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-cd ../..
-%{__aclocal}
+cd ../../gettext-tools
+%{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-
 %configure \
        --target=%{target} \
        --host=%{target} \
        --disable-csharp \
-       --enable-static
+       --enable-static \
+       --without-bzip2 \
+       --without-git \
+       --with-xz
 
-%{__make} \
-       SHELL=bash
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -124,9 +125,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
@@ -137,7 +138,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libintl.la
 %{_libdir}/libasprintf.dll.a
 %{_libdir}/libasprintf.la
-%{_includedir}/*.h
+%{_includedir}/autosprintf.h
+%{_includedir}/libintl.h
 
 %files static
 %defattr(644,root,root,755)