rpms/SDL_sound/devel .cvsignore, 1.2, 1.3 SDL_sound.spec, 1.1, 1.2 sources, 1.2, 1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore SDL_sound.spec sources 
Log Message:
* Sun Feb 17 2008 Hans de Goede <j.w.r.degoede at 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 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SDL_sound/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Oct 2007 18:37:04 -0000	1.2
+++ .cvsignore	17 Feb 2008 17:47:26 -0000	1.3
@@ -1,2 +1 @@
-SDL_sound-1.0.1-doxygen-docs.tar.gz
 SDL_sound-1.0.1.tar.gz


Index: SDL_sound.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_sound/devel/SDL_sound.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SDL_sound.spec	29 Oct 2007 18:37:04 -0000	1.1
+++ SDL_sound.spec	17 Feb 2008 17:47:26 -0000	1.2
@@ -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 @@
 # 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 @@
 
 
 %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 @@
     --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 @@
 
 
 %changelog
+* Sun Feb 17 2008 Hans de Goede <j.w.r.degoede at 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 at hhs.nl> 1.0.1-8
 - Stop unnecessary linking to libvorbisenc (bz 355811)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SDL_sound/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Oct 2007 18:37:04 -0000	1.2
+++ sources	17 Feb 2008 17:47:26 -0000	1.3
@@ -1,2 +1 @@
-def9927f2aa06739914bdb26ece6c253  SDL_sound-1.0.1-doxygen-docs.tar.gz
 537a5b05045bd9585ada63945f9a97b4  SDL_sound-1.0.1.tar.gz