From 9d234532b821b1acd7f88004e758c84b721a122b Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomasvs@fedoraproject.org>
Date: Thu, 16 Jun 2005 19:04:15 +0000
Subject: [PATCH] incorporate changes from ville

---
 liboggz.spec | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/liboggz.spec b/liboggz.spec
index 9102655..5ed2eb5 100644
--- a/liboggz.spec
+++ b/liboggz.spec
@@ -1,6 +1,6 @@
 Name:           liboggz
 Version:        0.9.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple programming interface for Ogg files and streams
 
 Group:          System Environment/Libraries
@@ -49,27 +49,27 @@ development using liboggz.
 %setup -q -n %{name}-%{version}
 %patch -p1
 %patch1 -p0
-
-%build
 aclocal
 autoconf
 automake
+
+%build
 %configure
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall docdir=`pwd`/doxygen
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # remove doxygen build stamp; fixed in upstream CVS
-rm -f $RPM_BUILD_ROOT%{_datadir}/doc/liboggz/doxygen-build.stamp
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/doxygen-build.stamp
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-                                                                                
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README
@@ -81,17 +81,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
+%doc doxygen/html
 %{_libdir}/liboggz.so
 %{_libdir}/liboggz.a
 %{_libdir}/pkgconfig/oggz.pc
-%doc %{_docdir}/liboggz
-%{_includedir}/oggz/oggz*.h
+%{_includedir}/oggz
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Jun 16 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.1-3: update for Ville's comments
+
 * Mon Jun 13 2005 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.1-2: rpmlint cleanup