From 38a4d7aadf823384623a02017b4b02e5968f817342317c02325f9936d6aa1b4a Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Mon, 21 Mar 2016 20:46:06 +0000 Subject: [PATCH] Accepting request 376077 from home:Mailaender:branches:games new upstream release OBS-URL: https://build.opensuse.org/request/show/376077 OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=37 --- scummvm-1.7.0.tar.bz2 | 3 --- scummvm-1.8.0.tar.xz | 3 +++ scummvm-themed_icons.patch | 40 -------------------------------------- scummvm-underlinking.patch | 13 ------------- scummvm.changes | 20 +++++++++++++++++++ scummvm.spec | 22 ++++++++------------- 6 files changed, 31 insertions(+), 70 deletions(-) delete mode 100644 scummvm-1.7.0.tar.bz2 create mode 100644 scummvm-1.8.0.tar.xz delete mode 100644 scummvm-themed_icons.patch delete mode 100644 scummvm-underlinking.patch diff --git a/scummvm-1.7.0.tar.bz2 b/scummvm-1.7.0.tar.bz2 deleted file mode 100644 index 02b28ee..0000000 --- a/scummvm-1.7.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 -size 20018016 diff --git a/scummvm-1.8.0.tar.xz b/scummvm-1.8.0.tar.xz new file mode 100644 index 0000000..49e1c95 --- /dev/null +++ b/scummvm-1.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a85c23a2b1fcb7586a7527ecdbdf6c899a45ecbdcba28b9322057dc27914daa8 +size 17385064 diff --git a/scummvm-themed_icons.patch b/scummvm-themed_icons.patch deleted file mode 100644 index 351226d..0000000 --- a/scummvm-themed_icons.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: ports.mk -=================================================================== ---- ports.mk.orig -+++ ports.mk -@@ -10,8 +10,10 @@ install: - $(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/" -- $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(datarootdir)/pixmaps/scummvm.xpm" -+ $(INSTALL) -d "$(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/" -+ $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/scummvm.xpm" -+ $(INSTALL) -d "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/" -+ $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/scummvm.svg" - $(INSTALL) -d "$(DESTDIR)$(docdir)" - $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)" - $(INSTALL) -d "$(DESTDIR)$(datadir)" -@@ -26,8 +28,10 @@ install-strip: - $(INSTALL) -c -s -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/" -- $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(datarootdir)/pixmaps/scummvm.xpm" -+ $(INSTALL) -d "$(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/" -+ $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/scummvm.xpm" -+ $(INSTALL) -d "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/" -+ $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/scummvm.svg" - $(INSTALL) -d "$(DESTDIR)$(docdir)" - $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)" - $(INSTALL) -d "$(DESTDIR)$(datadir)" -@@ -40,7 +44,8 @@ endif - uninstall: - rm -f "$(DESTDIR)$(bindir)/$(EXECUTABLE)" - rm -f "$(DESTDIR)$(mandir)/man6/scummvm.6" -- rm -f "$(DESTDIR)$(datarootdir)/pixmaps/scummvm.xpm" -+ rm -f "$(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/scummvm.xpm" -+ rm -f "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/scummvm.svg" - rm -rf "$(DESTDIR)$(docdir)" - rm -rf "$(DESTDIR)$(datadir)" - ifdef DYNAMIC_MODULES diff --git a/scummvm-underlinking.patch b/scummvm-underlinking.patch deleted file mode 100644 index e7165a7..0000000 --- a/scummvm-underlinking.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: rules.mk -=================================================================== ---- rules.mk.orig -+++ rules.mk -@@ -42,7 +42,7 @@ ifdef PLUGIN - PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX) - $(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS) - $(QUIET)$(MKDIR) plugins -- $(QUIET_PLUGIN)$(CXX) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@ -+ $(QUIET_PLUGIN)$(CXX) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) $(LIBS) -o $@ - - # Reset PLUGIN var - PLUGIN:= diff --git a/scummvm.changes b/scummvm.changes index 69b248a..9b9dd79 100644 --- a/scummvm.changes +++ b/scummvm.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sun Mar 6 12:25:48 UTC 2016 - mailaender@opensuse.org + +- Update to 1.8.0 + * New Games: + - Amazon: Guardians of Eden + - Beavis and Butthead in Virtual Stupidity + - Broken Sword 2.5: The Return of the Templars + - Labyrinth of Time + - Rex Nebular and the Cosmic Gender Bender + - Sfinx + - The Lost Files of Sherlock Holmes: The Case of the Rose Tattoo + - The Lost Files of Sherlock Holmes: The Case of the Serrated Scalpel + - Zork: Grand Inquisitor + - Zork Nemesis: The Forbidden Lands + * Updated the MT-32 (Miles Audio) emulator + * Overhauled the graphics subsystem in AGI +- Remove scummvm-underlinking.patch +- Remove scummvm-themed_icons.patch + ------------------------------------------------------------------- Sat Sep 13 19:21:29 UTC 2014 - mailaender@opensuse.org diff --git a/scummvm.spec b/scummvm.spec index 533d929..5c22f05 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -1,7 +1,7 @@ # # spec file for package scummvm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,19 +20,13 @@ %bcond_with mp3 Name: scummvm -Version: 1.7.0 +Version: 1.8.0 Release: 0 Summary: Interpreter for several adventure games License: GPL-2.0+ Group: Amusements/Games/Other Url: http://www.scummvm.org/ -Source0: http://prdownloads.sourceforge.net/scummvm/scummvm-%{version}.tar.bz2 -Patch0: scummvm-themed_icons.patch -# It's an ugly workaround but makes the sword25 engine plugin link against -# png/theora, and since we use --as-needed there are no real problems. Once the -# engine passes to the main binary the problem will dissapear. -# It could also be good to make it use the system's Lua. -Patch1: scummvm-underlinking.patch +Source: http://www.scummvm.org/frs/scummvm/%{version}/scummvm-%{version}.tar.xz BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -65,7 +59,7 @@ ScummVM is an interpreter that will play graphic adventure games written for LucasArts' SCUMM virtual machine (such as Day of the Tentacle and Monkey Island), Sierra's AGI adventures (such as early King's Quest and Space Quest games), Adventure Soft's Simon the Sorcerer 1, 2 and Feeble Files, -Revolution Software's Beneath a Steel Sky and Broken Sword 1 and 2, +Revolution Software's Beneath a Steel Sky and Broken Sword 1, 2 and 2.5, Interactive Binary Illusions' Flight of the Amazon Queen, Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth, Westwood's Legend of Kyrandia, and various others. @@ -76,13 +70,11 @@ Group: Amusements/Games/Other Requires: %{name} = %{version} %description extra -lastexpress, sword25 and toltecs engines for ScummVM. +lastexpress and toltecs engines for ScummVM. These engines are in a worse state, but allow to play extra games. %prep %setup -q -%patch0 -%patch1 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" base/version.cpp backends/plugins/elf/version.cpp FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') @@ -101,7 +93,6 @@ CXXFLAGS="%{optflags}" ; export CXXFLAGS ; \ --enable-verbose-build \ --enable-plugins \ --enable-engine-dynamic=lastexpress \ - --enable-engine-dynamic=sword25 \ --enable-engine-dynamic=wintermute # Subengines are not included even as dynamic since I don't want to touch the main engines make %{?_smp_mflags} @@ -113,9 +104,11 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ dists/scummvm.d %post %icon_theme_cache_post +%desktop_database_post %postun %icon_theme_cache_postun +%desktop_database_postun %files %defattr(0644,root,root,0755) @@ -124,6 +117,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ dists/scummvm.d %{_mandir}/man6/scummvm.6* %{_datadir}/applications/scummvm.desktop %{_datadir}/icons/hicolor/*/*/* +%{_datadir}/pixmaps/scummvm.xpm %{_docdir}/%{name} %files extra