[scummvm] new upstream release

[Lucian Langa]

commit faa83de203a44c6d73bb12ec6188470fc806cdcc
Author: Lucian Langa <lucilanga at gnome.org>
Date:   Sat Oct 16 00:14:08 2010 +0300

    new upstream release

 .gitignore                   |    2 +
 scummvm-1.0.0-lure-vga.patch |   69 ------------------------------------------
 scummvm-1.0.0-nostrip.patch  |   17 ----------
 scummvm-1.2.0-nostrip.patch  |   12 +++++++
 scummvm.spec                 |   17 +++++-----
 sources                      |    2 +-
 6 files changed, 24 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4503194..11ac541 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 scummvm-1.1.1.tar.bz2
 scummvm-icons.tar.gz
+/scummvm-1.2.0.tar.bz2
+/scummvm-icons.tar.gz
diff --git a/scummvm-1.2.0-nostrip.patch b/scummvm-1.2.0-nostrip.patch
new file mode 100644
index 0000000..0e944e2
--- /dev/null
+++ b/scummvm-1.2.0-nostrip.patch
@@ -0,0 +1,12 @@
+diff -Naur scummvm-1.2.0/ports.mk scummvm-1.2.0-mod/ports.mk
+--- scummvm-1.2.0/ports.mk	2010-09-25 16:01:48.000000000 +0300
++++ scummvm-1.2.0-mod/ports.mk	2010-10-15 11:37:14.000000000 +0300
+@@ -10,7 +10,7 @@
+ #
+ install:
+ 	$(INSTALL) -d "$(DESTDIR)$(bindir)"
+-	$(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
++	$(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
+ 	$(INSTALL) -d "$(DESTDIR)$(mandir)/man6/"
+ 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(mandir)/man6/scummvm.6"
+ 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/pixmaps/"
diff --git a/scummvm.spec b/scummvm.spec
index 086e04e..f7b25d1 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -1,6 +1,6 @@
 Name:		scummvm
-Version:	1.1.1
-Release:	2%{?dist}
+Version:	1.2.0
+Release:	1%{?dist}
 Summary:	Interpreter for several adventure games
 Group:		Applications/Emulators
 License:	GPLv2+
@@ -8,10 +8,7 @@ URL:		http://scummvm.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 #######		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
+Patch0:		scummvm-1.2.0-nostrip.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
@@ -36,7 +33,6 @@ Vision's Gobliiins; Westwood Studios' The Legend of Kyrandia
 %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
@@ -49,7 +45,7 @@ sed -i 's/Application;Game;AdventureGame;/Game;Emulator;/' \
 # The disables are so that these don't accidently get build in when rebuilding
 # on a system with the necesarry deps installed
 ./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \
-	--datadir=%{_datadir} --disable-mad --enable-all-engines --enable-release
+	--datadir=%{_datadir}/scummvm --disable-mad --enable-all-engines --enable-release
 make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
 
 
@@ -104,6 +100,11 @@ fi
 
 
 %changelog
+* Fri Oct 15 2010 Lucian Langa <cooly at gnome.eu.org> - 1.2.0-1
+- update nostrip patch
+- drop patch1 - fixed upstream
+- new upstream release
+
 * Fri Sep 17 2010 Lucian Langa <cooly at gnome.eu.org> - 1.1.1-2
 - update description
 - add enable-release flag
diff --git a/sources b/sources
index 3225bbe..2ee8151 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ed9098a78022d07fa1482f14325e3ab8  scummvm-1.1.1.tar.bz2
+fae9a3dbd4d2892664a8bcb161eb8d9a  scummvm-1.2.0.tar.bz2
 b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz