- reverted previous bogus change (too old gcc)

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

diff --git a/crossmingw32-libiconv.spec b/crossmingw32-libiconv.spec
index 015e67cc735a3ce8bc2136da52c7882fee204a81..100369d531cbbb2493ea161e5370e28e94645582 100644 (file)
--- a/crossmingw32-libiconv.spec
+++ b/crossmingw32-libiconv.spec
@@ -1,14 +1,13 @@
-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.11
-Release:       1
-License:       LGPL
-Group:         Libraries
-Source0:       ftp://ftp.gnu.org/gnu/libiconv/%{_realname}-%{version}.tar.gz
-# Source0-md5: b77a17e4a5a817100ad4b2613935055e
-Patch0:                %{name}.patch
+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.13.1
+Release:       2
+License:       LGPL v2+
+Group:         Development/Libraries
+Source0:       http://ftp.gnu.org/gnu/libiconv/%{realname}-%{version}.tar.gz
+# Source0-md5: 7ab33ebd26687c744a37264a330bbe9a
 URL:           http://www.gnu.org/software/libiconv/
 BuildRequires: automake
 BuildRequires: crossmingw32-gcc
@@ -21,84 +20,113 @@ 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                _pkgconfigdir           %{_prefix}/lib/pkgconfig
+%define                _libdir                 %{_prefix}/lib
+%define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
 
-%ifarch alpha sparc sparc64 sparcv9
+%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
 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.
+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 static -l pl.UTF-8
+Statyczne biblioteki iconv (wersja skrośna MinGW32).
 
 %package dll
-Summary:       %{_relaname} - DLL library for Windows
-Summary(pl.UTF-8):     %{_relaname} - biblioteka DLL dla Windows
+Summary:       DLL iconv libraries for Windows
+Summary(pl.UTF-8):     Biblioteki DLL iconv dla Windows
 Group:         Applications/Emulators
+Requires:      wine
 
 %description dll
-%{_realname} - DLL library for Windows.
+DLL iconv libraries for Windows.
 
 %description dll -l pl.UTF-8
-%{_realname} - biblioteka DLL dla Windows.
+Biblioteki DLL iconv dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
-%patch0 -p1
+%setup -q -n %{realname}-%{version}
 
 %build
-cp -f /usr/share/automake/config.sub libcharset/autoconf
-cp -f /usr/share/automake/config.sub autoconf
+cp -f /usr/share/automake/config.sub libcharset/build-aux
+cp -f /usr/share/automake/config.sub build-aux
 %configure \
-       AR="%{target}-ar" \
-       RANLIB="%{target}-ranlib" \
        --target="%{target}" \
-       --host="%{target_platform}" \
+       --host="%{target}" \
        --enable-static
 
 %{__make}
 
-%if 0%{!?debug:1}
-%{target}-strip {,libcharset/}lib/.libs/*.dll
-%{target}-strip -g -R.comment -R.note {,libcharset/}lib/.libs/*.a
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+install -d $RPM_BUILD_ROOT%{_dlldir}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install {,libcharset/}lib/.libs/*.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+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)
-%{_libdir}/*
-%{_includedir}/*.h
+%{_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)
-%{_bindir}/lib*.dll
-%{_datadir}/wine/windows/system/*
+%{_dlldir}/libcharset-*.dll
+%{_dlldir}/libiconv-*.dll