packages: crossmingw32-gettext/crossmingw32-gettext.spec - added bootstrap ...

[lkrotowski]

Author: lkrotowski                   Date: Fri Jan 22 01:02:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added bootstrap mode
- disabled building gettext-tools (patch)

---- Files affected:
packages/crossmingw32-gettext:
   crossmingw32-gettext.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: packages/crossmingw32-gettext/crossmingw32-gettext.spec
diff -u packages/crossmingw32-gettext/crossmingw32-gettext.spec:1.34 packages/crossmingw32-gettext/crossmingw32-gettext.spec:1.35
--- packages/crossmingw32-gettext/crossmingw32-gettext.spec:1.34	Tue Apr  8 10:24:51 2008
+++ packages/crossmingw32-gettext/crossmingw32-gettext.spec	Fri Jan 22 02:02:30 2010
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+#
+%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
@@ -10,14 +13,16 @@
 Source0:	http://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.gz
 # Source0-md5:	58a2bc6d39c0ba57823034d55d65d606
 Patch0:		%{realname}-info.patch
-Patch1:		%{realname}-killkillkill.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)
-BuildRequires:	crossmingw32-glib2 >= 2.0
+%{!?with_bootstrap:BuildRequires:	crossmingw32-glib2 >= 2.0}
 BuildRequires:	crossmingw32-libiconv
 BuildRequires:	libtool
 BuildRequires:	texinfo
@@ -72,21 +77,30 @@
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %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} \
@@ -142,6 +156,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2010/01/22 01:02:30  lkrotowski
+- added bootstrap mode
+- disabled building gettext-tools (patch)
+
 Revision 1.34  2008/04/08 08:24:51  glen
 - unify ftp.gnu.org urls
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-gettext/crossmingw32-gettext.spec?r1=1.34&r2=1.35&f=u