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

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index 52024c4..367206d 100644
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -2,27 +2,27 @@
 Summary:	PNG library - MinGW32 cross version
 Summary(pl.UTF-8):	Biblioteka PNG - wersja skrośna dla MinGW32
 Name:		crossmingw32-%{realname}
-Version:	1.5.10
+Version:	1.6.43
 Release:	1
 License:	distributable
 Group:		Development/Libraries
-Source0:	http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
-# Source0-md5:	9c2ac3c3a31de2ab867875718f8de18e
-Patch0:		%{realname}-pngminus.patch
-Patch1:		http://downloads.sourceforge.net/libpng-apng/%{realname}-%{version}-apng.patch.gz
-# Patch1-md5:	88517ab0e9c0be2590800116e2b50c8d
-Patch2:		%{realname}-apng-fix.patch
+Source0:	https://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
+# Source0-md5:	22b8362d16c3724eba9c1fb8d187320a
+Patch0:		https://downloads.sourceforge.net/libpng-apng/%{realname}-%{version}-apng.patch.gz
+# Patch0-md5:	fc21268c9c583c5d2e7ead8a9ec17240
+Patch1:		%{realname}-pngminus.patch
 URL:		http://www.libpng.org/pub/png/libpng.html
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-zlib
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz >= 1:4.999.7
-Requires:	crossmingw32-zlib
+Requires:	crossmingw32-zlib >= 1.2.9
 Provides:	crossmingw32-libpng(APNG) = 0.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
+%define		_enable_debug_packages	0
 
 %define		target			i386-mingw32
 %define		target_platform		i386-pc-mingw32
@@ -34,13 +34,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
+# -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
@@ -73,7 +76,7 @@ Statyczna biblioteka libpng (wersja skrośna MinGW32).
 Summary:	libpng - DLL library for Windows
 Summary(pl.UTF-8):	libpng - biblioteka DLL dla Windows
 Group:		Applications/Emulators
-Requires:	crossmingw32-zlib-dll
+Requires:	crossmingw32-zlib-dll >= 1.2.9
 Requires:	wine
 Provides:	crossmingw32-libpng-dll(APNG) = 0.10
 
@@ -87,10 +90,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 \
@@ -109,7 +108,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
@@ -123,20 +122,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