Name: mingw-libpng
Version: 1.2.31
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: MinGW Windows Libpng library
License: zlib
URL: http://www.libpng.org/pub/png/
Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
+Patch1: libpng-pngconf.patch
+Patch2: libpng-ztxt-bug.patch
+
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%prep
%setup -q -n libpng-%{version}
+%patch1 -p1
+%patch2 -p1
%build
%{_mingw_configure}
rm $RPM_BUILD_ROOT%{_mingw_libdir}/libpng.a
+# No need to distribute manpages which appear in the Fedora
+# native packages already.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
%clean
rm -rf $RPM_BUILD_ROOT
%{_mingw_libdir}/libpng12.la
%{_mingw_libdir}/pkgconfig/libpng.pc
%{_mingw_libdir}/pkgconfig/libpng12.pc
-%{_mingw_mandir}/man3/libpng.3*
-%{_mingw_mandir}/man3/libpngpf.3*
-%{_mingw_mandir}/man5/png.5*
+
%changelog
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.2.31-4
+- Add patches from rawhide RPM
+
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-3
+- Don't duplicate Fedora native manpages.
+
* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-2
- Remove static library.