From d5ad8e61e17e3acb9dd07c2ac958fbd87d5ebd8a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Oct 21 2007 14:27:48 +0000 Subject: - Don't install Makefile's as %doc, avoiding a multilib conflict (bz 342281) --- diff --git a/libogg.spec b/libogg.spec index 7b30ccc..11f3768 100644 --- a/libogg.spec +++ b/libogg.spec @@ -1,7 +1,7 @@ Summary: The Ogg bitstream file format library Name: libogg Version: 1.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 2 Group: System Environment/Libraries License: BSD @@ -43,6 +43,10 @@ make DESTDIR=$RPM_BUILD_ROOT install # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# create a cleaned up (Makefile free) copy of doc/libogg for %doc +mkdir -p _doc/libogg +cp -p doc/libogg/*.html doc/libogg/*.css _doc/libogg + %files %defattr(-,root,root) %doc AUTHORS CHANGES COPYING README @@ -53,7 +57,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %doc doc/*.html %doc doc/*.txt %doc doc/*.png -%doc doc/libogg +%doc _doc/libogg %dir %{_includedir}/ogg %{_includedir}/ogg/ogg.h %{_includedir}/ogg/os_types.h @@ -70,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Sun Oct 21 2007 Hans de Goede - 2:1.1.3-6 +- Don't install Makefile's as %doc, avoiding a multilib conflict (bz 342281) + * Wed Aug 22 2007 Adam Jackson - 2:1.1.3-5 - Rebuild for PPC toolchain bug