[scummvm/f13/master] new upstream release

Sun Oct 17 15:16:16 UTC 2010

commit d49ec6d9c8b0bb08445678cf796c61e07e28afca
Author: Lucian Langa <lucilanga at gnome.org>
Date:   Sun Oct 17 18:15:23 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                 |   78 +++++++++++++++++++++++------------------
 sources                      |    2 +-
 6 files changed, 59 insertions(+), 121 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 4503194..851ea31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 scummvm-1.1.1.tar.bz2
 scummvm-icons.tar.gz
+/scummvm-icons.tar.gz
+/scummvm-1.2.0.tar.bz2
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 789ae99..f7b25d1 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -1,43 +1,41 @@
-Name:           scummvm
-Version:        1.1.1
-Release:        1%{?dist}
-Summary:        Interpreter for several adventure games
-Group:          Applications/Emulators
-License:        GPLv2+
-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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL-devel libvorbis-devel flac-devel zlib-devel
-BuildRequires:  fluidsynth-devel desktop-file-utils
+Name:		scummvm
+Version:	1.2.0
+Release:	1%{?dist}
+Summary:	Interpreter for several adventure games
+Group:		Applications/Emulators
+License:	GPLv2+
+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.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
 %ifarch %{ix86}
-BuildRequires:  nasm
+BuildRequires:	nasm
 %endif
-Requires:       hicolor-icon-theme
+Requires:	hicolor-icon-theme
 
 %description
 ScummVM is an implementation of the SCUMM (Script Creation Utility for
 Maniac Mansion) engine used in various Lucas Arts games such as Monkey
 Island and Day of the Tentacle. At this time ScummVM should be considered
-ALPHA software, as it's still under heavy development. Be aware that while
-many games will work with few major bugs, crashes can happen. Also note
-that saved games can, and probably will, be incompatible between releases.
+beta software, and is still under heavy development.
 
 Also ScummVM is capable of playing several non-SCUMM games.
+Some of the adventures ScummVM supports include Adventure Soft's Simon
+the Sorcerer 1 and 2; Revolution's Beneath A Steel Sky, Broken Sword I
+and II; Flight of the Amazon Queen; Wyrmkeep's Inherit the Earth; Coktel
+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
+	dists/%{name}.desktop
 
 
 %build
@@ -47,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
+	--datadir=%{_datadir}/scummvm --disable-mad --enable-all-engines --enable-release
 make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
 
 
@@ -59,18 +57,18 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install             \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  dists/%{name}.desktop
+desktop-file-install \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	dists/%{name}.desktop
 
 install -D -p -m 0644 %{name}-16x16.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 install -D -p -m 0644 %{name}-32x32.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 install -D -p -m 0644 %{name}-48x48.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 install -D -p -m 0644 %{name}-128x128.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm
 
 
@@ -81,13 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
@@ -102,9 +100,21 @@ 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
+
 * Mon May 03 2010 Lucian Langa <cooly at gnome.eu.org> - 1.1.1-1
 - new upstream release
 
+* Sun Apr 05 2010 Lucian Langa <cooly at gnome.eu.org> - 1.1.0-1
+- new upstream release
+
 * 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
diff --git a/sources b/sources
index 3225bbe..93a6db5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ed9098a78022d07fa1482f14325e3ab8  scummvm-1.1.1.tar.bz2
 b20d750de2c88e8aefea364afae1776c  scummvm-icons.tar.gz
+fae9a3dbd4d2892664a8bcb161eb8d9a  scummvm-1.2.0.tar.bz2
