From be5d969dba7488fcb637242bf2480e97b7a464bf Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: May 23 2006 19:15:16 +0000
Subject: multilib


---

diff --git a/libpng.spec b/libpng.spec
index f1e6986..3c3aa27 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,11 +1,12 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Version: 1.2.10
-Release: 3
+Release: 4
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
 Patch0: libpng-rhconf.patch
+Patch1: libpng-1.2.8-multilib.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: zlib-devel
 Provides: libpng.so.3
@@ -41,6 +42,10 @@ the libpng package.
 %prep
 %setup -q
 
+ln -s scripts/makefile.linux Makefile
+%patch0 -p1 -b .rhconf
+%patch1 -p1 -b .multilib
+
 %build
 %configure
 make 
@@ -76,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng12.la
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue May 23 2006 Matthias Clasen  <mclasen@redhat.com> - 2:1.2.10-4
+- fix multilib conflicts
+
 * Mon May 22 2006 Matthias Clasen <mclasen@redhat.com> - 2:1.2.10-3
 - Add a comment about the need to keep static libraries