rpms/libogg/devel libogg.spec,1.25,1.26

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/libogg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16279

Modified Files:
	libogg.spec 
Log Message:
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2:1.1.3-6
- Don't install Makefile's as %doc, avoiding a multilib conflict (bz 342281)



Index: libogg.spec
===================================================================
RCS file: /cvs/extras/rpms/libogg/devel/libogg.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libogg.spec	22 Aug 2007 21:46:15 -0000	1.25
+++ libogg.spec	21 Oct 2007 14:27:48 -0000	1.26
@@ -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 @@
 # 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 @@
 %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 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2:1.1.3-6
+- Don't install Makefile's as %doc, avoiding a multilib conflict (bz 342281)
+
 * Wed Aug 22 2007 Adam Jackson <ajax at redhat.com> - 2:1.1.3-5
 - Rebuild for PPC toolchain bug