X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-libpng.git;a=blobdiff_plain;f=crossmingw32-libpng.spec;h=e9f49767f86037c2401f39e2ccca08e0052ab7ab;hp=a03955320988dfe291ff6746ff34d039de706b1f;hb=231a43ad0a65f092e0b216d77a51349e1ac05944;hpb=2b67cc26654843398481f44543bafc2b09982aa6

diff --git a/crossmingw32-libpng.spec b/crossmingw32-libpng.spec
index a039553..e9f4976 100644
--- a/crossmingw32-libpng.spec
+++ b/crossmingw32-libpng.spec
@@ -1,37 +1,43 @@
 %define		realname	libpng
 Summary:	PNG library - Mingw32 cross version
-Summary(pl):	Biblioteka PNG - wersja skro¶na dla Mingw32
+Summary(pl.UTF-8):	Biblioteka PNG - wersja skrośna dla Mingw32
 Name:		crossmingw32-%{realname}
-Version:	1.2.6
-Release:	2.beta2
+Version:	1.2.28
+Release:	1
 License:	distributable
-Group:		Libraries
-Source0:	http://dl.sourceforge.net/libpng/%{realname}-%{version}beta2.tar.bz2
-# Source0-md5:	45c811627b6fe4d37ec191b4548da949
+Group:		Development/Libraries
+Source0:	http://dl.sourceforge.net/libpng/%{realname}-%{version}.tar.lzma
+# Source0-md5:	8c57a49f822b12374af7668633c11e45
 Patch0:		%{realname}-pngminus.patch
-Patch1:		%{realname}-badchunks.patch
-Patch2:		%{realname}-opt.patch
-Patch3:		%{realname}-revert.patch
-Patch4:		%{realname}-16bit-overflow.patch
-Patch5:		%{realname}-norpath.patch
-Patch6:		%{realname}-libdirfix.patch
-Patch7:		%{name}-shared.patch
+Patch1:		%{realname}-opt.patch
+Patch2:		%{realname}-revert.patch
+Patch3:		%{realname}-norpath.patch
+# http://littlesvr.ca/apng/
+Patch4:		%{realname}-apng.patch
+Patch5:		%{name}-shared.patch
 URL:		http://www.libpng.org/pub/png/libpng.html
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake
 BuildRequires:	crossmingw32-gcc
-BuildRequires:	crossmingw32-w32api
 BuildRequires:	crossmingw32-zlib
+BuildRequires:	libtool
+BuildRequires:	lzma >= 1:4.42
+Requires:	crossmingw32-zlib
+Provides:	crossmingw32-libpng(APNG) = 0.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
 
-%define		target		i386-mingw32
-%define		target_platform	i386-pc-mingw32
-%define		arch		%{_prefix}/%{target}
-%define		gccarch		%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib		%{_prefix}/lib/gcc-lib/%{target}/%{version}
+%define		target			i386-mingw32
+%define		target_platform		i386-pc-mingw32
 
-%define		__cc		%{target}-gcc
-%define		__cxx		%{target}-g++
+%define		_sysprefix		/usr
+%define		_prefix			%{_sysprefix}/%{target}
+%define		_libdir			%{_prefix}/lib
+%define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
+%define		_dlldir			/usr/share/wine/windows/system
+%define		__cc			%{target}-gcc
+%define		__cxx			%{target}-g++
 
 %ifarch alpha sparc sparc64 sparcv9
 %define		optflags	-O2
@@ -42,70 +48,101 @@ The PNG library is a collection of routines used to create and
 manipulate PNG format graphics files. The PNG format was designed as a
 replacement for GIF, with many improvements and extensions.
 
-%description -l pl
-Biblioteki PNG s± kolekcj± form u¿ywanych do tworzenia i manipulowania
-plikami w formacie graficznym PNG. Format ten zosta³ stworzony jako
-zamiennik dla formatu GIF, z wieloma rozszerzeniami i nowo¶ciami.
+This package contains the cross version for Win32.
+
+%description -l pl.UTF-8
+Biblioteki PNG są kolekcją form używanych do tworzenia i manipulowania
+plikami w formacie graficznym PNG. Format ten został stworzony jako
+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)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Provides:	crossmingw32-libpng-static(APNG) = 0.10
+
+%description static
+Static libpng library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libpng (wersja skrośna mingw32).
 
 %package dll
 Summary:	libpng - DLL library for Windows
-Summary(pl):	libpng - biblioteka DLL dla Windows
+Summary(pl.UTF-8):	libpng - biblioteka DLL dla Windows
 Group:		Applications/Emulators
+Requires:	crossmingw32-zlib-dll
+Requires:	wine
+Provides:	crossmingw32-libpng-dll(APNG) = 0.10
 
 %description dll
 libpng - DLL library for Windows.
 
-%description dll -l pl
+%description dll -l pl.UTF-8
 libpng - biblioteka DLL dla Windows.
 
 %prep
-%setup -q -n %{realname}-%{version}beta2
+%setup -q -n %{realname}-%{version} -c -T
+lzma -dc %{SOURCE0} | tar xf - -C ..
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+%patch4 -p0
 %patch5 -p1
-%patch6 -p1
-
-%ifarch %{ix86}
-ln -sf scripts/makefile.gcmmx ./Makefile
-%else
-ln -sf scripts/makefile.linux ./Makefile
-%endif
-
-%patch7 -p1
 
 %build
-%{__make} \
-	prefix=%{_arch} \
-	LIBPATH=%{_arch}/lib \
-	CC="%{target}-gcc" \
-	RANLIB="%{target}-ranlib"
-	OPT_FLAGS="%{rpmcflags}"
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	--target=%{target} \
+	--host=%{target} \
+	--with-pkgconfigdir=%{_pkgconfigdir}
 
-%if 0%{!?debug:1}
-%{target}-strip -R.comment -R.note *.dll
-%{target}-strip -g -R.comment -R.note *.a
-%endif
+%{__make} \
+	ECHO=echo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{arch}/{include,lib}
-install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
 
-install *.a $RPM_BUILD_ROOT%{arch}/lib
-install png.h pngconf.h $RPM_BUILD_ROOT%{arch}/include
-install *.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{arch}/include/*
-%{arch}/lib/*
+%{_libdir}/libpng.dll.a
+%{_libdir}/libpng12.dll.a
+%{_libdir}/libpng.la
+%{_libdir}/libpng12.la
+%dir %{_includedir}/libpng12
+%{_includedir}/libpng12/*
+%{_pkgconfigdir}/*.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libpng.a
+%{_libdir}/libpng12.a
 
 %files dll
 %defattr(644,root,root,755)
-%{_datadir}/wine/windows/system
+%{_dlldir}/libpng-*.dll
+%{_dlldir}/libpng12-*.dll