X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libpng%2Fmingw-libpng.spec;h=96377d720c5cb5b3fb263e06c6d7a3a374d4c181;hb=c290098c415554af6e67e1d46e7db8da052a1b37;hp=676999831442648635b13e03aeaedcec428f1395;hpb=ae8f34545f03a94f98b08586b8c3bc4d24d13819;p=fedora-mingw.git

diff --git a/libpng/mingw-libpng.spec b/libpng/mingw-libpng.spec
index 6769998..96377d7 100644
--- a/libpng/mingw-libpng.spec
+++ b/libpng/mingw-libpng.spec
@@ -6,12 +6,15 @@
 
 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)
 
@@ -28,6 +31,8 @@ MinGW Windows Libpng library.
 
 %prep
 %setup -q -n libpng-%{version}
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{_mingw_configure}
@@ -41,6 +46,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 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
@@ -62,11 +70,15 @@ 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.