rpms/scummvm/F-12 scummvm-1.0.0-lure-vga.patch, NONE, 1.1 scummvm.spec, 1.20, 1.21

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/scummvm/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12603

Modified Files:
	scummvm.spec 
Added Files:
	scummvm-1.0.0-lure-vga.patch 
Log Message:
* Sun Apr  4 2010 Hans de Goede <hdegoede at redhat.com> - 1.0.0-2
- When starting lure from the cmdline (as the lure fedora package .desktop
  file does) prefer the VGA version over the EGA version


scummvm-1.0.0-lure-vga.patch:
 detection.cpp |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE scummvm-1.0.0-lure-vga.patch ---
diff -up scummvm-1.0.0/engines/lure/detection.cpp~ scummvm-1.0.0/engines/lure/detection.cpp
--- scummvm-1.0.0/engines/lure/detection.cpp~	2009-11-07 01:08:41.000000000 +0100
+++ scummvm-1.0.0/engines/lure/detection.cpp	2010-04-04 10:08:03.337518043 +0200
@@ -59,53 +59,53 @@ static const LureGameDescription gameDes
 	{
 		{
 			"lure",
-			"EGA",
-			AD_ENTRY1("disk1.ega", "e9c9fdd8a19f7910d68e53cb84651273"),
+			"VGA",
+			AD_ENTRY1("disk1.vga", "b2a8aa6d7865813a17a3c636e063572e"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
 			GUIO_NONE
 		},
-		GF_FLOPPY | GF_EGA,
+		GF_FLOPPY,
 	},
 
 	{
 		{
 			"lure",
-			"VGA",
-			AD_ENTRY1("disk1.vga", "b2a8aa6d7865813a17a3c636e063572e"),
+			"EGA",
+			AD_ENTRY1("disk1.ega", "e9c9fdd8a19f7910d68e53cb84651273"),
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
 			GUIO_NONE
 		},
-		GF_FLOPPY,
+		GF_FLOPPY | GF_EGA,
 	},
 
 	{
 		{
 			"lure",
-			"EGA",
-			AD_ENTRY1("disk1.ega", "b80aced0321f64c58df2c7d3d74dfe79"),
+			"VGA",
+			AD_ENTRY1("disk1.vga", "cf69d5ada228dd74f89046691c16aafb"),
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
 			GUIO_NONE
 		},
-		GF_FLOPPY | GF_EGA,
+		GF_FLOPPY,
 	},
 
 	{
 		{
 			"lure",
-			"VGA",
-			AD_ENTRY1("disk1.vga", "cf69d5ada228dd74f89046691c16aafb"),
+			"EGA",
+			AD_ENTRY1("disk1.ega", "b80aced0321f64c58df2c7d3d74dfe79"),
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
 			GUIO_NONE
 		},
-		GF_FLOPPY,
+		GF_FLOPPY | GF_EGA,
 	},
 
 	{


Index: scummvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scummvm/F-12/scummvm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- scummvm.spec	26 Nov 2009 06:42:43 -0000	1.20
+++ scummvm.spec	4 Apr 2010 08:38:38 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           scummvm
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interpreter for several adventure games
 Group:          Applications/Emulators
 License:        GPLv2+
@@ -9,6 +9,9 @@ Source0:        http://downloads.sourcef
 #######         Icons extracted from icons/scummvm.ico with the gimp
 Source1:        scummvm-icons.tar.gz
 Patch0:         scummvm-1.0.0-nostrip.patch
+# Submitted upstream:
+# https://sourceforge.net/tracker/?func=detail&aid=2981748&group_id=37116&atid=418820
+Patch1:         scummvm-1.0.0-lure-vga.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel libvorbis-devel flac-devel zlib-devel
 BuildRequires:  fluidsynth-devel desktop-file-utils
@@ -31,6 +34,7 @@ Also ScummVM is capable of playing sever
 %prep
 %setup -q -a 1
 %patch0 -p1 -b .nostrip
+%patch1 -p1 -b .lure-vga
 sed -i 's/%{name}.xpm/%{name}/' dists/%{name}.desktop
 sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
   dists/%{name}.desktop
@@ -98,6 +102,10 @@ fi
 
 
 %changelog
+* Sun Apr  4 2010 Hans de Goede <hdegoede at redhat.com> - 1.0.0-2
+- When starting lure from the cmdline (as the lure fedora package .desktop
+  file does) prefer the VGA version over the EGA version
+
 * Wed Nov 25 2009 Lucian Langa <cooly at gnome.eu.org> - 1.0.0-1
 - drop patch1 - fixed upstream
 - update patch0 to 1.0.0 release