From 72273bb41636ce68fad8098dbd701e0578656e9a Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Wed, 1 Sep 2010 17:06:23 -0400 Subject: [PATCH] fix multilib conflict --- libvpx.spec | 7 +++++-- 1 file 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 0.9.1-3 +- only package html docs to avoid multilib conflict (bz 613185) + * Thu Jun 24 2010 Tom "spot" Callaway 0.9.1-2 - build shared library the old way for generic arches