From 4f159166b57e8db2b7def563020f07b186db213b Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomasvs@fedoraproject.org>
Date: Tue, 19 Jul 2005 10:14:24 +0000
Subject: [PATCH] new upstream release; fix spec

---
 .cvsignore   |  2 +-
 liboggz.spec | 38 +++++++++++++-------------------------
 sources      |  2 +-
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index aaeff31..c27d6b7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-liboggz-0.9.1.tar.gz
+liboggz-0.9.2.tar.gz
diff --git a/liboggz.spec b/liboggz.spec
index 5ed2eb5..8e3f1d4 100644
--- a/liboggz.spec
+++ b/liboggz.spec
@@ -1,16 +1,12 @@
 Name:           liboggz
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.9.2
+Release:        1%{?dist}
 Summary:        Simple programming interface for Ogg files and streams
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:		http://www.annodex.net/
 Source:		http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz
-# fixed in upstream CVS
-Patch:		liboggz.autotools.patch
-# fixed in upstream CVS
-Patch1:		liboggz.corruption.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	doxygen
@@ -19,12 +15,6 @@ BuildRequires:	libogg-devel >= 1.0
 # libtool
 BuildRequires:	gcc-c++
 
-# since we patch Makefile.am
-BuildRequires:	libtool
-BuildRequires:	automake
-BuildRequires:	autoconf
-BuildRequires:	pkgconfig
-
 %description
 Oggz provides a simple programming interface for reading and writing Ogg files
 and streams. Ogg is an interleaving data container developed by Monty at
@@ -47,11 +37,6 @@ development using liboggz.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1
-%patch1 -p0
-aclocal
-autoconf
-automake
 
 %build
 %configure
@@ -59,17 +44,17 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall docdir=`pwd`/doxygen
+%makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version}
 
 # 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%{_docdir}/%{name}-devel-%{version}/doxygen-build.stamp
+# not particularly interested in the tex docs, the html version has everything
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version}/latex
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
+                                                                                
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README
@@ -81,19 +66,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%doc doxygen/html
+%{_includedir}/oggz
 %{_libdir}/liboggz.so
 %{_libdir}/liboggz.a
 %{_libdir}/pkgconfig/oggz.pc
-%{_includedir}/oggz
+%doc %{_docdir}/%{name}-devel-%{version}
 
 %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 Jul 18 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.9.2-1
+- new upstream version
+- removed patches
+- moved devel docs to versioned location
 
 * Mon Jun 13 2005 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.1-2: rpmlint cleanup
diff --git a/sources b/sources
index 0e81ca5..23fd1dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-476ce0b2eb000a0b0e2102d2e8d79580  liboggz-0.9.1.tar.gz
+53a0217f4c3d0de1d187e5079c087b22  liboggz-0.9.2.tar.gz