X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-gettext.spec;h=b5a6788fe697995666a5b4865bb082ad2c1074b6;hb=d8ceb413a041fd6a0f9699ab1422f80b47586aac;hp=74befb09dde6aacf0b9600d24ce4e755b1b7d597;hpb=fb17fcec5eb3c5803c0054200b482d178a2552c9;p=packages%2Fcrossmingw32-gettext.git

diff --git a/crossmingw32-gettext.spec b/crossmingw32-gettext.spec
index 74befb0..b5a6788 100644
--- a/crossmingw32-gettext.spec
+++ b/crossmingw32-gettext.spec
@@ -1,24 +1,25 @@
-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
-Release:	1
+Version:	0.19.8.1
+Release:	2
 License:	LGPL v2+
 Group:		Development/Libraries
-Source0:	ftp://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.gz
-# Source0-md5:	58a2bc6d39c0ba57823034d55d65d606
-Patch0:		%{realname}-info.patch
-Patch1:		%{realname}-killkillkill.patch
+Source0:	http://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.lz
+# Source0-md5:	d838d2c4144261d0c5fbab4a0aceb5c1
+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.13
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-gcc-c++
-# just to shorten build (libgettextlib is not packaged anyway)
-BuildRequires:	crossmingw32-glib2 >= 2.0
 BuildRequires:	crossmingw32-libiconv
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2
+BuildRequires:	lzip
+BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo
 Requires:	crossmingw32-libiconv
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,32 +28,40 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
-%define		arch			%{_prefix}/%{target}
 
 %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
 %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
@@ -72,29 +81,46 @@ Biblioteki DLL gettext dla Windows.
 %patch0 -p1
 %patch1 -p1
 
+%{__sed} -i \
+	-e 's@m4_esyscmd(\[build-aux/git-version-gen \.tarball-version\])@[%{version}]@' \
+	configure.ac
+%{__sed} -i \
+	-e 's@m4_esyscmd(\[\.\./build-aux/git-version-gen \.\./\.tarball-version\])@[%{version}]@' \
+	gettext-runtime/configure.ac \
+	gettext-tools/configure.ac
+
 %build
 %{__libtoolize}
-%{__aclocal}
+cd gettext-runtime
+%{__libtoolize}
+%{__aclocal} -I m4 -I ../m4 -I gnulib-m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-cd autoconf-lib-link
-%{__aclocal} -I m4 -I ../m4
+cd libasprintf
+%{__aclocal} -I ../../m4 -I ../m4 -I gnulib-m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-cd ../gettext-runtime
-%{__aclocal} -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
+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
@@ -103,16 +129,16 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
 %{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
@@ -123,7 +149,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)