X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-gettext.git;a=blobdiff_plain;f=crossmingw32-gettext.spec;h=a1dcce879f4dc8843add839c9454d5f267244115;hp=ccac1945fca22ce2395cfa6c59bd766091a0fa57;hb=618b2e0a02a6005c57cd3a8fc90793ac2ad8f674;hpb=f9b2d2107b692d9cdfb26807a2af0244a5d92dee

diff --git a/crossmingw32-gettext.spec b/crossmingw32-gettext.spec
index ccac194..a1dcce8 100644
--- a/crossmingw32-gettext.spec
+++ b/crossmingw32-gettext.spec
@@ -1,27 +1,25 @@
-#
-# Conditional build:
-%bcond_without	asprintf	# without libasprintf (in C++)
-#
-%define		realname		gettext
 Summary:	gettext libraries - cross mingw32 version
-Summary(pl):	Biblioteki gettext - wersja skro¶na dla mingw32
-Name:		crossmingw32-%{realname}
-Version:	0.14
+Summary(pl.UTF-8):	Biblioteki gettext - wersja skrośna dla mingw32
+%define		_realname		gettext
+Name:		crossmingw32-%{_realname}
+Version:	0.16.1
 Release:	1
 License:	LGPL
-Group:		Libraries
-Source0:	ftp://ftp.gnu.org/pub/gnu/gettext/%{realname}-%{version}.tar.gz
-# Source0-md5:	e715be150bbe32439ae68fab32df0299
-Patch0:		%{realname}-info.patch
-Patch1:		%{realname}-killkillkill.patch
+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
 URL:		http://www.gnu.org/software/gettext/
-BuildRequires:	autoconf >= 2.57
-BuildRequires:	automake >= 1.7.5
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake >= 1:1.10
 BuildRequires:	crossmingw32-gcc
-%{?with_asprintf:BuildRequires:	crossmingw32-gcc-c++}
+BuildRequires:	crossmingw32-gcc-c++
 BuildRequires:	crossmingw32-libiconv
 BuildRequires:	libtool
+BuildRequires:	texinfo
 Requires:	crossmingw32-libiconv
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,48 +27,74 @@ 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		_pkgconfigdir		%{_prefix}/lib/pkgconfig
+%define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
 
 %description
 gettext libraries - cross mingw32 version.
 
-%description -l pl
-Biblioteki gettext - wersja skro¶na dla mingw32.
+%description -l pl.UTF-8
+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)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static gettext libraries (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczne biblioteki gettext (wersja skrośna mingw32).
+
+%package dll
+Summary:	DLL gettext libraries for Windows
+Summary(pl.UTF-8):	Biblioteki DLL gettext dla Windows
+Group:		Applications/Emulators
+Requires:	crossmingw32-libiconv-dll
+Requires:	wine
+
+%description dll
+DLL gettext libraries for Windows.
+
+%description dll -l pl.UTF-8
+Biblioteki DLL gettext dla Windows.
 
 %prep
-%setup -q -n %{realname}-%{version}
+%setup -q -n %{_realname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
-# it's m4_included somewhere
-install %{_aclocaldir}/libtool.m4 config/m4/libtool.m4
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 cd autoconf-lib-link
-%{__aclocal} -I m4 -I ../config/m4
+%{__aclocal} -I m4 -I ../m4
 %{__autoconf}
 %{__automake}
 cd ../gettext-runtime
-%{__aclocal} -I m4 -I ../autoconf-lib-link/m4 -I ../gettext-tools/m4 -I ../config/m4
+%{__aclocal} -I m4 -I gnulib-m4 -I ../autoconf-lib-link/m4 -I ../m4
 %{__autoconf}
 %{__automake}
 cd ..
 
 %configure \
-	AR="%{target}-ar" \
-	RANLIB="%{target}-ranlib" \
 	--target=%{target} \
-	--host=%{target_platform} \
+	--host=%{target} \
 	--disable-csharp \
-	--disable-static
+	--enable-static
+
 %{__make}
 
 %install
@@ -79,21 +103,35 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $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%{_bindir}/*.dll
+%{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}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_bindir}/libintl-3.dll
-%if %{with asprintf}
-%{_libdir}/libasprintf.a
-%{_libdir}/libasprintf.la
-%endif
 %{_libdir}/libintl.dll.a
 %{_libdir}/libintl.la
+%{_libdir}/libasprintf.dll.a
+%{_libdir}/libasprintf.la
 %{_includedir}/*.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libintl.a
+%{_libdir}/libasprintf.a
+
+%files dll
+%defattr(644,root,root,755)
+%{_dlldir}/libintl-8.dll
+%{_dlldir}/libasprintf-0.dll