[libvpx/el5/master] fix multilib conflict

[Tom Callaway]

commit 11fe33319ad382639496ed9ba776beba24b1c577
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Sep 1 16:06:04 2010 -0400

    fix multilib conflict

 libvpx.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/libvpx.spec b/libvpx.spec
index 6893ad6..8a244b7 100644
--- a/libvpx.spec
+++ b/libvpx.spec
@@ -1,7 +1,7 @@
 Name:			libvpx
 Summary:		VP8 Video Codec SDK
 Version:		0.9.1
-Release:		2%{?dist}
+Release:		3%{?dist}
 License:		BSD
 Group:			System Environment/Libraries
 Source0:		http://webm.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@ Source1:		libvpx.pc
 Source2:		libvpx.ver
 Patch0:			libvpx-0.9.0-no-explicit-dep-on-static-lib.patch
 URL:			http://www.webmproject.org/tools/vp8-sdk/
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %ifarch %{ix86} x86_64
 BuildRequires:		yasm
 %endif
@@ -99,6 +100,7 @@ mv libNOTvpx.a libvpx.a
 mv libNOTvpx_g.a libvpx_g.a
 
 %install
+rm -rf %{buildroot}
 make DIST_DIR=%{buildroot}%{_prefix} dist
 
 # Install the pkg-config file
@@ -147,7 +149,7 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 # These are SDK docs, not really useful to an end-user.
-%doc docs/
+%doc docs/html/
 %{_includedir}/vpx/
 %{_libdir}/pkgconfig/libvpx.pc
 %{_libdir}/libvpx.so
@@ -157,6 +159,9 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
+* Wed Sep  1 2010 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.1-3
+- only package html docs to avoid multilib conflict (bz 613185)
+
 * Thu Jun 24 2010 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.1-2
 - build shared library the old way for generic arches