[Scummvm-cvs-logs] CVS: scummvm/dists/redhat scummvm-nomad.patch,NONE,1.1.2.1 scummvm-vorbis.patch,NONE,1.1.2.1 scummvm.spec,1.1.2.3,1.1.2.4

[Max Horn]

Update of /cvsroot/scummvm/scummvm/dists/redhat
In directory sc8-pr-cvs1:/tmp/cvs-serv19776

Modified Files:
      Tag: branch-0-5-0
	scummvm.spec 
Added Files:
      Tag: branch-0-5-0
	scummvm-nomad.patch scummvm-vorbis.patch 
Log Message:
new .spec file from trunk, just in case we make a 0.5.1 release

--- NEW FILE: scummvm-nomad.patch ---
--- scummvm-0.5.0/Makefile	2003-08-01 21:14:54.000000000 +0200
+++ scummvm-0.5.0/Makefile.mad	2003-08-01 21:17:59.000000000 +0200
@@ -49,8 +49,8 @@
 #######################################################################
 
 # Uncomment this to activate the MAD lib for compressed sound files
-DEFINES += -DUSE_MAD
-LIBS    += -lmad
+# DEFINES += -DUSE_MAD
+# LIBS    += -lmad
 
 # Uncomment this to activate the Ogg Vorbis lib for compressed sound files
 # DEFINES += -DUSE_VORBIS

--- NEW FILE: scummvm-vorbis.patch ---
--- scummvm-0.5.0/Makefile	2003-08-01 21:18:49.000000000 +0200
+++ scummvm-0.5.0/Makefile.vorbis	2003-08-01 21:19:06.000000000 +0200
@@ -53,8 +53,8 @@
 # LIBS    += -lmad
 
 # Uncomment this to activate the Ogg Vorbis lib for compressed sound files
-# DEFINES += -DUSE_VORBIS
-# LIBS    += -lvorbisfile -lvorbis
+DEFINES += -DUSE_VORBIS
+LIBS    += -lvorbisfile -lvorbis
 
 # Uncomment this to activate the ALSA lib for midi
 # DEFINES += -DUSE_ALSA

Index: scummvm.spec
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dists/redhat/scummvm.spec,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- scummvm.spec	1 Aug 2003 16:26:51 -0000	1.1.2.3
+++ scummvm.spec	1 Aug 2003 21:30:41 -0000	1.1.2.4
@@ -9,7 +9,7 @@
 #------------------------------------------------------------------------------
 Name		: scummvm
 Version		: 0.5.0
-Release		: @RELEASE@
+Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
 License		: GPL
@@ -19,6 +19,9 @@
 Source		: %{name}-%{version}.tar.gz
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
+Patch0: scummvm-nomad.patch
+Patch1: scummvm-vorbis.patch
+
 #------------------------------------------------------------------------------
 #   Description
 #------------------------------------------------------------------------------
@@ -32,7 +35,9 @@
 #   install scripts
 #------------------------------------------------------------------------------
 %prep
-%setup -q -n scummvm
+%setup -q -n scummvm-%{version}
+%patch0 -p1 -b .mad
+%patch1 -p1 -b .vorbis
 
 %build
 make
@@ -57,7 +62,7 @@
 #   Change Log
 #------------------------------------------------------------------------------
 %changelog
-* 0.5.0 (2003-08-02)
+* Sat Aug 02 2003 (0.5.0)
   - Enhanced versions of Maniac Mansion and Zak McKracken are now supported and completable
   - Beneath A Steel Sky is now supported and completable
   - Added support for Amiga version of Monkey Island 1
@@ -71,18 +76,18 @@
   - Improved music and sound support in Zak256
   - Added Aspect Ratio option
   - Many other bug fixes, improvements and optimisations
-* 0.4.1 (2003-05-25)
+* Sun May 25 2003 (0.4.1)
   - Added AdvMame3x filter
-  - Fixed crash Curse of Monkey Island (and possibly other games as well)
+  - Fixed crash in Curse of Monkey Island (and possibly other games as well)
   - Fixed airport doors in Zak256
   - Fixed crash in SDL backend
   - Fixed various iMuse bugs
-* 0.4.0 (2003-05-11)
+* Sun May 11 2003 (0.4.0)
   - Curse of Monkey Island (comi) support (experimental)
   - Added support for the EGA versions of Loom, Monkey Island and Indy3
   - Improved music support in Indy3 and the floppy versions of Monkey Islands
   - Many Simon the Sorcerer 1 & 2 improvements and fixes
-  - Very pre-alpha Beneath a Steel Sky code. Don't expect it to do anything. 
+  - Very pre-alpha Beneath a Steel Sky code. Don't expect it to do anything.
   - Even more pre-alpha support for V2 SCUMM games (Maniac Mansion and Zak)
   - Preliminary support for early Humongous Entertainment titles (very experimental)
   - New debug console and several GUI/Launcher enhancements
@@ -93,7 +98,7 @@
   - Large memory leak fixed for The Dig/ComI
   - SMUSH code optimised, frame dropping added for slower machines
   - Code cleanups
-* 0.3.0 (2002-12-01)
+* Sun Dec 01 2002 (0.3.0)
   - massive cleanup work for iMUSE. Sam and Max music now plays correctly
   - many bugfixes for Zak256, + sound and music support
   - music support for Simon the Sorcerer on any platform with real MIDI
@@ -109,7 +114,7 @@
   - new SMUSH video engine, for Full Throttle and The Dig
   - new in-game GUI
   - launcher dialog
-* 0.2.0 (2002-04-14)
+* Sun Apr 14 2002 (0.2.0)
   - core engine rewrite
   - enhanced ingame GUI, including options/volume settings.
   - auto-save feature
@@ -122,11 +127,11 @@
   - enhanced V6 game support (Sam and Max is now completable)
   - experimental support for V7 games (Full Throttle/The Dig)
   - experimental support for V3 games (Zak256/Indy3)
-* 0.1.0 (2002-01-13)
+* Sun Jan 13 2002 (0.1.0)
   - loads of changes
-* 0.0.2 (2001-10-12):
+* Fri Oct 12 2001 (0.0.2)
   - bug fixes
   - save & load support
-* 0.0.1 (2001-10-08):
+* Mon Oct 8 2001 (0.0.1)
   - initial version