[libvpx/f14/master] fix multilib conflict

[Tom Callaway]

commit c185c4049e3d0c1c234abf91a2857aa8d8e770d4
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Sep 1 17:05:43 2010 -0400

    fix multilib conflict

 libvpx.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/libvpx.spec b/libvpx.spec
index 6893ad6..4869ebe 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
@@ -147,7 +147,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 +157,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