X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-libiconv.spec;h=3272bc7bbd960ec4faaf4c53117e7b5e334aa71b;hb=70076f4471ea488df43bb686f68f978a3521fb1e;hp=590ccb6d6efb8f9664e94ec84fc5ead326e1f910;hpb=1c2c06ec5ceb1273566403a12090bf177c8f849c;p=packages%2Fcrossmingw32-libiconv.git

diff --git a/crossmingw32-libiconv.spec b/crossmingw32-libiconv.spec
index 590ccb6..3272bc7 100644
--- a/crossmingw32-libiconv.spec
+++ b/crossmingw32-libiconv.spec
@@ -1,87 +1,134 @@
-%define		realname		libiconv
-%define		snapshot		2003.02.01-1
-Summary:	Character set conversion library - mingw32 cross version
-Summary(pl):	Biblioteka konwersji zestawów znaków - wersja skro¶na dla mingw32
+Summary:	Character set conversion library - MinGW32 cross version
+Summary(pl.UTF-8):	Biblioteka konwersji zestawów znaków - wersja skrośna dla MinGW32
+%define		realname   libiconv
 Name:		crossmingw32-%{realname}
-Version:	1.8
-Release:	1
-License:	LGPL
-Group:		Libraries
-Source0:	http://dl.sourceforge.net/mingw/%{realname}-%{version}-%{snapshot}-src.tar.bz2
-# Source0-md5:	3cda71fd0e14d5f5fa4eca85f053eaea
-Patch0:		crossmingw32-libiconv.patch
+Version:	1.14
+Release:	3
+License:	LGPL v3+
+Group:		Development/Libraries
+Source0:	http://ftp.gnu.org/gnu/libiconv/%{realname}-%{version}.tar.gz
+# Source0-md5:	e34509b1623cec449dfeb73d7ce9c6c6
 URL:		http://www.gnu.org/software/libiconv/
-BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	crossmingw32-gcc
-BuildRequires:	gtk-doc >= 0.9-4
-BuildRequires:	libtool
-BuildRequires:	rpm-build >= 4.1-8.2
-BuildRoot:	%{tmpdir}/%{realname}-%{version}-root-%(id -u -n)
+# because of broken w32 relink in libtool
+BuildConflicts:	crossmingw32-libiconv < 1.10
+Requires:	crossmingw32-runtime
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
 
 %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		target_platform		i386-pc-mingw32
 
+%define		_sysprefix		/usr
+%define		_prefix			%{_sysprefix}/%{target}
+%define		_libdir			%{_prefix}/lib
+%define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
 
+%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,.*
+%define		filterout_c	-f[-a-z0-9=]*
+%define		filterout_cxx	-f[-a-z0-9=]*
+
 %description
 The libiconv library provides an iconv() implementation, for use on
 systems which don't have one, or whose implementation cannot convert
 from/to Unicode.
 
-This package contains the cross version for mingw32.
+This package contains the cross version for MinGW32.
+
+%description -l pl.UTF-8
+Ta biblioteka dostarcza implementację iconv() do używania z systemami,
+które takiej funkcji nie posiadają, lub na których implementacja nie
+potrafi konwertować z/do Unikodu.
+
+Ten pakiet zawiera wersję skrośną dla MinGW32.
+
+%package static
+Summary:	Static iconv libraries (cross MinGW32 version)
+Summary(pl.UTF-8):	Statyczne biblioteki iconv (wersja skrośna MinGW32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static iconv libraries (cross MinGW32 version).
 
-%description -l pl
-Ta biblioteka dostarcza implementacjê iconv() do u¿ywania z systemami,
-które takiej funkcji nie posiadaj±, lub na których implementacja nie
-potrafi konwertowaæ z/do Unikodu.
+%description static -l pl.UTF-8
+Statyczne biblioteki iconv (wersja skrośna MinGW32).
 
-Ten pakiet zawiera wersjê skro¶n± dla mingw32.
+%package dll
+Summary:	DLL iconv libraries for Windows
+Summary(pl.UTF-8):	Biblioteki DLL iconv dla Windows
+Group:		Applications/Emulators
+Requires:	wine
+
+%description dll
+DLL iconv libraries for Windows.
+
+%description dll -l pl.UTF-8
+Biblioteki DLL iconv dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
-%patch0 -p1
 
 %build
-CC=%{target}-gcc ; export CC
-CXX=%{target}-g++ ; export CXX
-LD=%{target}-ld ; export LD
-AR=%{target}-ar ; export AR
-AS=%{target}-as ; export AS
-CROSS_COMPILE=1 ; export CROSS_COMPILE
-CPPFLAGS="-I%{arch}/include" ; export CPPFLAGS
-
-rm -f missing
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-
+cp -f /usr/share/automake/config.sub libcharset/build-aux
+cp -f /usr/share/automake/config.sub build-aux
 %configure \
-	--target=%{target} \
-	--host=%{target_platform} \
-	--prefix=%{arch} \
-	--disable-static \
-	--bindir=%{arch}/bin \
-	--libdir=%{arch}/lib \
-	--includedir=%{arch}/include
+	--target="%{target}" \
+	--host="%{target}" \
+	--enable-static
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}
+install -d $RPM_BUILD_ROOT%{_dlldir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%if 0%{!?debug:1}
+%{target}-strip -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
+
+# not used on win32
+rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias
+# runtime only
+rm -f $RPM_BUILD_ROOT%{_bindir}/iconv
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{doc,man}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{arch}
+%{_libdir}/libcharset.dll.a
+%{_libdir}/libiconv.dll.a
+%{_libdir}/libcharset.la
+%{_libdir}/libiconv.la
+%{_includedir}/iconv.h
+%{_includedir}/libcharset.h
+%{_includedir}/localcharset.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libcharset.a
+%{_libdir}/libiconv.a
+
+%files dll
+%defattr(644,root,root,755)
+%{_dlldir}/libcharset-*.dll
+%{_dlldir}/libiconv-*.dll