- x32 rebuild

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

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index 06bb89ba0108476042d7f23b3877e54c438ba473..4a8eb2a75baea1167be8e7bb8b3947db109675b0 100644 (file)
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -2,15 +2,15 @@
 Summary:       PNG library - MinGW32 cross version
 Summary(pl.UTF-8):     Biblioteka PNG - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.4.3
-Release:       1
+Version:       1.6.16
+Release:       2
 License:       distributable
 Group:         Development/Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
-# Source0-md5: 322e2e0c0dea7a374ce6e60d9a72e604
+# Source0-md5: 23b7286b5d4a86de950fd2ffc5cac742
 Patch0:                %{realname}-pngminus.patch
-# http://littlesvr.ca/apng/diff/%{name}-%{version}-apng.patch | dos2unix
-Patch1:                %{realname}-apng.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: crossmingw32-gcc
 BuildRequires: crossmingw32-zlib
@@ -33,13 +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}
 
 %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,.*
+# -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
@@ -83,13 +86,9 @@ libpng - DLL library for Windows.
 libpng - biblioteka DLL dla Windows.
 
 %prep
-%setup -q -n %{realname}-%{version} -c -T
-xz -dc %{SOURCE0} | tar xf - -C ..
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p0
-
-# avoid version script
-sed -i -e 's/^GLD=.*/GLD=/' configure
+%patch1 -p1
 
 %build
 %configure \
@@ -108,34 +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 libpng14.dll.a $RPM_BUILD_ROOT%{_libdir}/libpng.dll.a
+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}/libpng14.dll.a
+%{_libdir}/libpng16.dll.a
 %{_libdir}/libpng.dll.a
-%{_libdir}/libpng14.la
+%{_libdir}/libpng16.la
 %{_libdir}/libpng.la
-%{_includedir}/libpng14
+%{_includedir}/libpng16
 %{_includedir}/png*.h
-%{_pkgconfigdir}/libpng14.pc
+%{_pkgconfigdir}/libpng16.pc
 %{_pkgconfigdir}/libpng.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpng14.a
+%{_libdir}/libpng16.a
 %{_libdir}/libpng.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libpng14-*.dll
+%{_dlldir}/libpng16-*.dll