- updated to 1.6.6

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

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index da7f0de15548e00469c54d98488a9d1a439446ed..bdd9230eadb2b7486fc7dfe5843308aa5c462f36 100644 (file)
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -2,16 +2,15 @@
 Summary:       PNG library - MinGW32 cross version
 Summary(pl.UTF-8):     Biblioteka PNG - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.5.12
+Version:       1.6.6
 Release:       1
 License:       distributable
 Group:         Development/Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
-# Source0-md5: 0fd51add1da6a0e470e0c726c59171b9
+# Source0-md5: 3a41dcd58bcac7cc191c2ec80c7fb2ac
 Patch0:                %{realname}-pngminus.patch
-Patch1:                http://downloads.sourceforge.net/libpng-apng/%{realname}-%{version}-apng.patch.gz
-# Patch1-md5:  7f2924b1fe0cca9080e18b8720443716
-Patch2:                %{realname}-apng-fix.patch
+Patch1:                http://downloads.sourceforge.net/libpng-apng/%{realname}-1.6.5-apng.patch.gz
+# Patch1-md5:  e05f0ba9534e0331bf499d63811cbf93
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-zlib
@@ -34,6 +33,8 @@ 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
@@ -88,10 +89,6 @@ libpng - biblioteka DLL dla Windows.
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-
-# avoid version script
-sed -i -e 's/^GLD=.*/GLD=/' configure
 
 %build
 %configure \
@@ -110,7 +107,7 @@ 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 libpng15.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
@@ -124,20 +121,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/libpng15.dll.a
+%{_libdir}/libpng16.dll.a
 %{_libdir}/libpng.dll.a
-%{_libdir}/libpng15.la
+%{_libdir}/libpng16.la
 %{_libdir}/libpng.la
-%{_includedir}/libpng15
+%{_includedir}/libpng16
 %{_includedir}/png*.h
-%{_pkgconfigdir}/libpng15.pc
+%{_pkgconfigdir}/libpng16.pc
 %{_pkgconfigdir}/libpng.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpng15.a
+%{_libdir}/libpng16.a
 %{_libdir}/libpng.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libpng15-*.dll
+%{_dlldir}/libpng16-*.dll