- added bootstrap mode

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

diff --git a/crossmingw32-gettext.spec b/crossmingw32-gettext.spec
index 6e0acf3611312d181ac623489e00d1a5143841c4..e971a1ca612c2fd894b54717daf130a1048eb157 100644 (file)
--- a/crossmingw32-gettext.spec
+++ b/crossmingw32-gettext.spec
@@ -1,22 +1,27 @@
+#
+%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
-Name:          crossmingw32-%{_realname}
-Version:       0.16.1
+%define                realname                gettext
+Name:          crossmingw32-%{realname}
+Version:       0.17
 Release:       1
-License:       LGPL
+License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       ftp://ftp.gnu.org/gnu/gettext/%{_realname}-%{version}.tar.gz
-# Source0-md5: 3d9ad24301c6d6b17ec30704a13fe127
-Patch0:                %{_realname}-info.patch
-Patch1:                %{_realname}-killkillkill.patch
-Patch2:                %{name}.patch
-Patch3:                %{_realname}-localename.patch
+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
 URL:           http://www.gnu.org/software/gettext/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.10
 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
@@ -27,12 +32,10 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
-%define                arch                    %{_prefix}/%{target}
-%define                gccarch                 %{_prefix}/lib/gcc-lib/%{target}
-%define                gcclib                  %{_prefix}/lib/gcc-lib/%{target}/%{version}
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
+%define                _libdir                 %{_prefix}/lib
 %define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
@@ -70,7 +73,7 @@ DLL gettext libraries for Windows.
 Biblioteki DLL gettext dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -78,18 +81,25 @@ Biblioteki DLL gettext dla Windows.
 
 %build
 %{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
 cd autoconf-lib-link
 %{__aclocal} -I m4 -I ../m4
 %{__autoconf}
 %{__automake}
 cd ../gettext-runtime
+%{__libtoolize}
 %{__aclocal} -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
+cd libasprintf
+%{__aclocal} -I ../m4 -I ../../m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../..
+%{__aclocal}
+%{__autoconf}
 %{__automake}
-cd ..
 
 %configure \
        --target=%{target} \
@@ -97,7 +107,8 @@ cd ..
        --disable-csharp \
        --enable-static
 
-%{__make}
+%{__make} \
+       SHELL=bash
 
 %install
 rm -rf $RPM_BUILD_ROOT