- x32 rebuild

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

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index f76aabd87a5c75a173ee7c07a25d3befa9884834..4a8eb2a75baea1167be8e7bb8b3947db109675b0 100644 (file)
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -1,27 +1,22 @@
 %define                realname        libpng
-Summary:       PNG library - Mingw32 cross version
-Summary(pl.UTF-8):     Biblioteka PNG - wersja skrośna dla Mingw32
+Summary:       PNG library - MinGW32 cross version
+Summary(pl.UTF-8):     Biblioteka PNG - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.2.29
-Release:       1
+Version:       1.6.16
+Release:       2
 License:       distributable
 Group:         Development/Libraries
-Source0:       http://dl.sourceforge.net/libpng/%{realname}-%{version}.tar.lzma
-# Source0-md5: 6b1342278d9a5a531b36f10886de0065
+Source0:       http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
+# Source0-md5: 23b7286b5d4a86de950fd2ffc5cac742
 Patch0:                %{realname}-pngminus.patch
-Patch1:                %{realname}-opt.patch
-Patch2:                %{realname}-revert.patch
-Patch3:                %{realname}-norpath.patch
-# http://littlesvr.ca/apng/
-Patch4:                %{realname}-apng.patch
-Patch5:                %{name}-shared.patch
+Patch1:                http://downloads.sourceforge.net/libpng-apng/%{realname}-%{version}-apng.patch.gz
+# Patch1-md5:  52de72a29e5d0428a0e527be74b99c24
 URL:           http://www.libpng.org/pub/png/libpng.html
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-zlib
-BuildRequires: libtool
-BuildRequires: lzma >= 1:4.42
+BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz >= 1:4.999.7
 Requires:      crossmingw32-zlib
 Provides:      crossmingw32-libpng(APNG) = 0.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,10 +33,16 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
+%define                __pkgconfig_provides    %{nil}
+%define                __pkgconfig_requires    %{nil}
 
-%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, most of -f options are Linux-specific
+%define                filterout_ld    -Wl,-z,.*
+%define                filterout_c     -f[-a-z0-9=]*
 
 %description
 The PNG library is a collection of routines used to create and
@@ -58,17 +59,17 @@ zamiennik dla formatu GIF, z wieloma rozszerzeniami i nowościami.
 Ten pakiet zawiera wersję skrośną dla Win32.
 
 %package static
-Summary:       Static libpng library (cross mingw32 version)
-Summary(pl.UTF-8):     Statyczna biblioteka libpng (wersja skrośna mingw32)
+Summary:       Static libpng library (cross MinGW32 version)
+Summary(pl.UTF-8):     Statyczna biblioteka libpng (wersja skrośna MinGW32)
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Provides:      crossmingw32-libpng-static(APNG) = 0.10
 
 %description static
-Static libpng library (cross mingw32 version).
+Static libpng library (cross MinGW32 version).
 
 %description static -l pl.UTF-8
-Statyczna biblioteka libpng (wersja skrośna mingw32).
+Statyczna biblioteka libpng (wersja skrośna MinGW32).
 
 %package dll
 Summary:       libpng - DLL library for Windows
@@ -85,21 +86,11 @@ libpng - DLL library for Windows.
 libpng - biblioteka DLL dla Windows.
 
 %prep
-%setup -q -n %{realname}-%{version} -c -T
-lzma -dc %{SOURCE0} | tar xf - -C ..
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
        --target=%{target} \
        --host=%{target} \
@@ -116,32 +107,34 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_dlldir}
 mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
+ln -sf libpng16.dll.a $RPM_BUILD_ROOT%{_libdir}/libpng.dll.a
+
 %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 -rf $RPM_BUILD_ROOT%{_datadir}/man
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/man
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%{_libdir}/libpng16.dll.a
 %{_libdir}/libpng.dll.a
-%{_libdir}/libpng12.dll.a
+%{_libdir}/libpng16.la
 %{_libdir}/libpng.la
-%{_libdir}/libpng12.la
-%dir %{_includedir}/libpng12
-%{_includedir}/libpng12/*
-%{_pkgconfigdir}/*.pc
+%{_includedir}/libpng16
+%{_includedir}/png*.h
+%{_pkgconfigdir}/libpng16.pc
+%{_pkgconfigdir}/libpng.pc
 
 %files static
 %defattr(644,root,root,755)
+%{_libdir}/libpng16.a
 %{_libdir}/libpng.a
-%{_libdir}/libpng12.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libpng-*.dll
-%{_dlldir}/libpng12-*.dll
+%{_dlldir}/libpng16-*.dll