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

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index af3601a..52024c4 100644
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -1,24 +1,23 @@
 %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.26
+Version:	1.5.10
 Release:	1
 License:	distributable
 Group:		Development/Libraries
-Source0:	http://dl.sourceforge.net/libpng/%{realname}-%{version}.tar.lzma
-# Source0-md5:	08910ba5da02003b81afb30f630b98a5
+Source0:	http://downloads.sourceforge.net/libpng/%{realname}-%{version}.tar.xz
+# Source0-md5:	9c2ac3c3a31de2ab867875718f8de18e
 Patch0:		%{realname}-pngminus.patch
-Patch1:		%{realname}-opt.patch
-Patch2:		%{realname}-revert.patch
-Patch3:		%{realname}-norpath.patch
-Patch4:		%{realname}-apng.patch
-Patch5:		%{realname}-cve.patch
-Patch6:		%{name}-shared.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
-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)
@@ -36,9 +35,12 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
 
-%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
+%define		filterout_ld    -Wl,-z,.*
 
 %description
 The PNG library is a collection of routines used to create and
@@ -55,17 +57,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
@@ -82,15 +84,13 @@ 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
-%patch6 -p1
+
+# avoid version script
+sed -i -e 's/^GLD=.*/GLD=/' configure
 
 %build
 %configure \
@@ -109,32 +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 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}/libpng15.dll.a
 %{_libdir}/libpng.dll.a
-%{_libdir}/libpng12.dll.a
+%{_libdir}/libpng15.la
 %{_libdir}/libpng.la
-%{_libdir}/libpng12.la
-%dir %{_includedir}/libpng12
-%{_includedir}/libpng12/*
-%{_pkgconfigdir}/*.pc
+%{_includedir}/libpng15
+%{_includedir}/png*.h
+%{_pkgconfigdir}/libpng15.pc
+%{_pkgconfigdir}/libpng.pc
 
 %files static
 %defattr(644,root,root,755)
+%{_libdir}/libpng15.a
 %{_libdir}/libpng.a
-%{_libdir}/libpng12.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libpng-*.dll
-%{_dlldir}/libpng12-*.dll
+%{_dlldir}/libpng15-*.dll