- x32 rebuild

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

diff --git a/crossmingw32-libiconv.spec b/crossmingw32-libiconv.spec
index e99943208df60139a73bbbc38b812e29a3126c25..a7595a2fcac043e361722a3353743aa5ad0d4093 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
+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.14
+Release:       2
+License:       LGPL v3+
 Group:         Development/Libraries
-Source0:       ftp://ftp.gnu.org/gnu/libiconv/%{_realname}-%{version}.tar.gz
-# Source0-md5: b77a17e4a5a817100ad4b2613935055e
-Patch0:                %{name}.patch
+Source0:       http://ftp.gnu.org/gnu/libiconv/%{realname}-%{version}.tar.gz
+# Source0-md5: e34509b1623cec449dfeb73d7ce9c6c6
 URL:           http://www.gnu.org/software/libiconv/
 BuildRequires: automake
 BuildRequires: crossmingw32-gcc
@@ -21,46 +20,46 @@ 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++
 
-%ifnarch 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)
+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).
+Static iconv libraries (cross MinGW32 version).
 
 %description static -l pl.UTF-8
-Statyczne biblioteki iconv (wersja skrośna mingw32).
+Statyczne biblioteki iconv (wersja skrośna MinGW32).
 
 %package dll
 Summary:       DLL iconv libraries for Windows
@@ -75,12 +74,11 @@ DLL iconv libraries for 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 \
        --target="%{target}" \
        --host="%{target}" \