From ec8bba3930a23ffe1a7a7aaedde1bf8cb9cda980 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Sun, 17 Feb 2008 17:47:26 +0000
Subject: [PATCH] - Rebuild for new libmikmod - Rebuild with gcc 4.3 - Stop
 shipping pre-generated doxygen docs, now that doxygen is fixed to no    
 longer cause multilib conflicts

---
 .cvsignore     |  1 -
 SDL_sound.spec | 17 ++++++++++-------
 sources        |  1 -
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 445d651..a768736 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-SDL_sound-1.0.1-doxygen-docs.tar.gz
 SDL_sound-1.0.1.tar.gz
diff --git a/SDL_sound.spec b/SDL_sound.spec
index 07cb84f..f66d71d 100644
--- a/SDL_sound.spec
+++ b/SDL_sound.spec
@@ -1,6 +1,6 @@
 Name:           SDL_sound
 Version:        1.0.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Library handling decoding of several popular sound file formats
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -10,13 +10,9 @@ URL:            http://www.icculus.org/SDL_sound
 # With all the files except the Makefiles under decoders/mpglib removed
 # for patent reasons
 Source0:        %{name}-%{version}.tar.gz  
-# prebuild doxygen docs to avoid multilib conflicts, to regenerate:
-# untar Source0, doxygen Doxyfile,
-# tar cvfz %{name}-%{version}-doxygen-docs.tar.gz docs
-Source1:        %{name}-%{version}-doxygen-docs.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel flac-devel speex-devel libvorbis-devel libogg-devel
-BuildRequires:  mikmod-devel libmodplug-devel physfs-devel
+BuildRequires:  mikmod-devel libmodplug-devel physfs-devel doxygen
 
 %description
 SDL_sound is a library that handles the decoding of several popular sound file 
@@ -45,7 +41,7 @@ This package contains the headers and libraries for SDL_sound development.
 
 
 %prep
-%setup -q -a 1
+%setup -q
 # Avoid lib64 rpaths
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 # We don't need libvorbisenc
@@ -59,6 +55,7 @@ export CPPFLAGS="$(pkg-config libmodplug --cflags)"
     --disable-smpeg --disable-mpglib --enable-mikmod --enable-ogg \
     --enable-modplug --enable-speex --enable-flac --enable-midi
 make %{?_smp_mflags}
+doxygen Doxyfile
 
 
 %install
@@ -117,6 +114,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 17 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 1.0.1-9
+- Rebuild for new libmikmod
+- Rebuild with gcc 4.3
+- Stop shipping pre-generated doxygen docs, now that doxygen is fixed to no
+  longer cause multilib conflicts 
+
 * Sun Oct 28 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 1.0.1-8
 - Stop unnecessary linking to libvorbisenc (bz 355811)
 
diff --git a/sources b/sources
index 5da4bc9..4f94b12 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-def9927f2aa06739914bdb26ece6c253  SDL_sound-1.0.1-doxygen-docs.tar.gz
 537a5b05045bd9585ada63945f9a97b4  SDL_sound-1.0.1.tar.gz