X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-libpng.spec;h=52024c46b0faffbde21b1c73d4f3a9a6694a3c8e;hb=8475a47fbb803914c50f4cbd26740f7aee5070a5;hp=21ff17763c10d9b57c696bd8c257691e0d522260;hpb=14ebbd4ff030a5e5b53b335c7cd90c84b3ee4a1e;p=packages%2Fcrossmingw32-libpng.git

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index 21ff177..52024c4 100644
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -2,15 +2,16 @@
 Summary:	PNG library - MinGW32 cross version
 Summary(pl.UTF-8):	Biblioteka PNG - wersja skrośna dla MinGW32
 Name:		crossmingw32-%{realname}
-Version:	1.4.5
+Version:	1.5.10
 Release:	1
 License:	distributable
 Group:		Development/Libraries
 Source0:	http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
-# Source0-md5:	37d420c7d8294aac438c150bb4335901
+# Source0-md5:	9c2ac3c3a31de2ab867875718f8de18e
 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:	88517ab0e9c0be2590800116e2b50c8d
+Patch2:		%{realname}-apng-fix.patch
 URL:		http://www.libpng.org/pub/png/libpng.html
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-zlib
@@ -39,8 +40,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		optflags	-O2
 %endif
 # -z options are invalid for mingw linker
-%define		filterout_ld	-Wl,-z,.*
-%define		filterout_c	-gdwarf-3
+%define		filterout_ld    -Wl,-z,.*
 
 %description
 The PNG library is a collection of routines used to create and
@@ -86,7 +86,8 @@ libpng - biblioteka DLL dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
+%patch2 -p1
 
 # avoid version script
 sed -i -e 's/^GLD=.*/GLD=/' configure
@@ -108,34 +109,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 libpng15.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}/libpng15.dll.a
 %{_libdir}/libpng.dll.a
-%{_libdir}/libpng14.la
+%{_libdir}/libpng15.la
 %{_libdir}/libpng.la
-%{_includedir}/libpng14
+%{_includedir}/libpng15
 %{_includedir}/png*.h
-%{_pkgconfigdir}/libpng14.pc
+%{_pkgconfigdir}/libpng15.pc
 %{_pkgconfigdir}/libpng.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpng14.a
+%{_libdir}/libpng15.a
 %{_libdir}/libpng.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libpng14-*.dll
+%{_dlldir}/libpng15-*.dll