updated .spec file by wjp; in particular, disable mad and enable vorbis by default (since RH9 doesn't ship with MAD); also correct the format of the changelog to be valid, and update the package descriptions

svn-id: r9385

3 files changed, 60 insertions, 14 deletions

diff --git a/dists/redhat/scummvm-nomad.patch b/dists/redhat/scummvm-nomad.patch
new file mode 100644
index 0000000000..b43ef466a4
--- /dev/null
+++ b/dists/redhat/scummvm-nomad.patch
@@ -0,0 +1,13 @@
+--- 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
diff --git a/dists/redhat/scummvm-vorbis.patch b/dists/redhat/scummvm-vorbis.patch
new file mode 100644
index 0000000000..22a09c3393
--- /dev/null
+++ b/dists/redhat/scummvm-vorbis.patch
@@ -0,0 +1,13 @@
+--- 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
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 8cd805b6e7..13bd007228 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -9,8 +9,8 @@
 #------------------------------------------------------------------------------
 Name		: scummvm
 Version		: 0.5.3cvs
-Release		: @RELEASE@
-Summary		: SCUMM graphic adventure game interpreter
+Release		: 1
+Summary		: Graphic adventure game interpreter
 Group		: Interpreters
 License		: GPL
 
@@ -19,19 +19,25 @@ Url             : http://www.scummvm.org
 Source		: %{name}-%{version}.tar.gz
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
+Patch0: scummvm-nomad.patch
+Patch1: scummvm-vorbis.patch
+
 #------------------------------------------------------------------------------
 #   Description
 #------------------------------------------------------------------------------
 %description
 ScummVM is an interpreter that will play graphic adventure games written for
-LucasArts' SCUMM virtual machine. It uses the SDL library for outputting
-graphics.
+LucasArts' SCUMM virtual machine, Adventure Soft's Simon the Sorcerer 1 and 2,
+and Revolution Software Ltd's Beneath a Steel Sky. It uses the SDL library for
+outputting graphics.
 
 #------------------------------------------------------------------------------
 #   install scripts
 #------------------------------------------------------------------------------
 %prep
-%setup -q -n scummvm
+%setup -q -n scummvm-%{version}
+%patch0 -p1 -b .mad
+%patch1 -p1 -b .vorbis
 
 %build
 make
@@ -56,18 +62,32 @@ rm -Rf %{buildroot}
 #   Change Log
 #------------------------------------------------------------------------------
 %changelog
-* 0.4.1 (2003-05-25)
+* 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
+  - Initial unplayable support for V1 version of Maniac Mansion/Zak McKracken
+  - Curse of Monkey Island (COMI) support for playing from CD improved on Mac OS X
+  - Loading COMI savegames for disk 2 doesn't anymore require disk 1 first
+  - Rewritten iMUSE enginee, and many Music fixes (exp. Monkey Island 2)
+  - Support for music in Humongous games and simon2dos/simon2talkie (XMIDI format)
+  - Support for music in simon1demo (Proprietary format)
+  - Complete music support for Simon the Sorcerer 2
+  - Improved music and sound support in Zak256
+  - Added Aspect Ratio option
+  - Many other bug fixes, improvements and optimisations
+* 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
@@ -78,7 +98,7 @@ rm -Rf %{buildroot}
   - 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
@@ -94,7 +114,7 @@ rm -Rf %{buildroot}
   - 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
@@ -107,11 +127,11 @@ rm -Rf %{buildroot}
   - 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