Accepting request 563453 from games

- Update to new upstream release 3.0.0 (2017-12-30) OBS-URL: https://build.opensuse.org/request/show/563453 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chocolate-doom?expand=0&rev=13
2018-01-13 20:47:01 +00:00 · 2018-01-13 20:47:01 +00:00 · e3e099e110
commit e3e099e110
parent f652931c22 cb7c8815ac
7 changed files with 56 additions and 46 deletions
--- a/chdoom-iwaddir.diff
+++ b/chdoom-iwaddir.diff
@ -12,14 +12,14 @@ IWADs, and so should chocolate-doom.
 src/d_iwad.c |    4 ++++
 1 file changed, 4 insertions(+)

-Index: chocolate-doom-2.3.0/src/d_iwad.c
+Index: chocolate-doom-3.0.0/src/d_iwad.c
 ===================================================================
--- chocolate-doom-2.3.0.orig/src/d_iwad.c
-+++ chocolate-doom-2.3.0/src/d_iwad.c
-@@ -650,6 +650,10 @@ static void AddXdgDirs(void)
-     // source ports is /usr/share/games/doom - we support this through the
-     // XDG_DATA_DIRS mechanism, through which it can be overridden.
-     AddIWADPath(env, "/games/doom");
+--- chocolate-doom-3.0.0.orig/src/d_iwad.c
+++ chocolate-doom-3.0.0/src/d_iwad.c
+@@ -664,6 +664,10 @@ static void AddXdgDirs(void)
+     // Edition into this directory, under which includes the Doom
+     // Classic WADs.
+     AddIWADPath(env, "/games/doom3bfg/base/wads");
 +
 +    env = "/usr/local/share:/usr/share";
 +    AddIWADPath(env, "/games/doom");
--- a/chocolate-doom-2.3.0.tar.gz
+++ b/chocolate-doom-2.3.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e6d1a82ac5c8b025a9695ce1e47d0dc6ed142ebb1129b1e4a70e2740f79150c
-size 2190744
--- a/chocolate-doom-2.3.0.tar.gz.asc
+++ b/chocolate-doom-2.3.0.tar.gz.asc
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Comment: GPGTools - http://gpgtools.org
-
-iQIcBAABCAAGBQJYZUOFAAoJEPbC7pwjNUNEQoAP/2HORtVU9REgswO5OkTil+3G
-9xLlrExCEzgAiFbE8RvSlypQbGxzdNNEpHeKKhwtNrHGMwF58Io3HNEcoPWy/dcD
-wfkgsBSJayeVEg0soJED0vqOMX+MTSeBYp2OCFPvwqPNMTc08N7sXt83liFiKORr
-xNs5uj5e7+rLoLbzrgzJZURrS6WTV8vXUR8ghzO52vAGwGbI0TsQSkfN7SuQGb0y
-hw4a/nudeYpqgACWKhTlc2pxw3NyrkMdJTKK5NVKQPlXZDOJ9YOrO/WP9x9L3Jxo
-P5sYome3/eTncJSydbSP/AixKUXNyufbcYb6Zc32qYY8r2GEek+29c37xhVyD14y
-mlN/ujcbx7aYCH5Ts2dgFcdMc/1+pcDXSOXJep8c+ejHuiLSGZbLsG5IbiFb7YcX
-rM9Q3Db3TuiOXf/053nPbM7d2pjaKCrHN8lZWn/TRUyf9IOU8upR4as5c+3s9whq
-r+8LXBDFlZULDX5k28z6WLVz/CbVUGffEsVYKlHAeW7G+IAmE3Nw8a+iNf8oGAQ4
-Swc3iQ1+whfCLAMsJCHAXdYgAlJuxzS5plIzYFr96p09x3o81R1PrzOohnYr6T/3
-kapiXQUHRjKqyybBpViKSck8EfK9BKPot/+otgorWwseBUQ1EK8BCwSqJRItkM6j
-AkC7aGFdK9MH/3DXQvvm
-=V74t
-----END PGP SIGNATURE-----
--- a/chocolate-doom-3.0.0.tar.gz
+++ b/chocolate-doom-3.0.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73aea623930c7d18a7a778eea391e1ddfbe90ad1ac40a91b380afca4b0e1dab8
+size 2495591
--- a/chocolate-doom-3.0.0.tar.gz.asc
+++ b/chocolate-doom-3.0.0.tar.gz.asc
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCAAdFiEEbSwRfgMQZkSXqpVG9sLunCM1Q0QFAlpIBGYACgkQ9sLunCM1
+Q0SIbxAAmkgwupipoAurZt6HvGYE3EdkP/+srA+xNaxHRDmn6Y7djkkUxAFTqM+A
+S9OXwU0Eig3PADThWs0OhdblTUDCc3imULMTb3Y57C0R1YPFcpcwbzHdJAapJKqc
+3M+6RQcf/OZvzMyN0A9yoFybloW5PzYn+SV2X02Ru2b/5916bJZkiP0MG3YCzH6X
+n5YrzRVgdx6YmJiikrz1IhoJzD5tXQ5EeMV2OXykzOA6Dvu05Goq6BU67kXtPXg+
+liB+1X8ZlHryIfhwgYtzv1DaCND2PVO7ogV/GdSRNkL7DlLp4NuWZQ+kMcA5Fmhh
+Iez4V1LBfRgpUbp5Gtg5VpwHMy8Q2Xz3O0ZHLwIOXtub/V28LAya64+8sg+wtQDE
+h6lXIw+047g54xUqaDsKUOclIN6gM3+GCy7xOAcyUv5OCTxoKT/UOrGezj2KZbAD
+Dze6ozuxiOHZ5MaZbY78lPyBXXtQkKgvIO5aVGSbsjagPGpuMJu4lN+THGJ/kq5U
+Fs3yw3fZmsMvvJcMzRBdUahLtBFE3dt4rGy00rljAmKImqg9/RhQNTWYSfn5DQ+D
+W0zPshzLUsKp4UpT02Nv8vK3/dWecsqjBKVmB/jyASdCYeEsrYa/sJPmJyqn9S52
+q92P2BpxhGkChr6pCS61jFJ2JQ21h3Z8akoeI7WanNY7jRKwBRM=
+=vIDA
+-----END PGP SIGNATURE-----
--- a/chocolate-doom.changes
+++ b/chocolate-doom.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Jan 10 11:51:11 UTC 2018 - jengelh@inai.de
+
+- Update to new upstream release 3.0.0 (2017-12-30)
+  * Update to SDL2. All scaling is now done in hardware.
+  * It is possible to toggle fullscreen with Alt-Enter.
+  * On multimonitor setups, the game will remember the used screen.
+  * A new parameter, -savedir allows users to specify a directory
+    from which to load and save games.
+  * The GOG install of Doom 3: BFG Edition is now detected.
+  * The CD audio option for music playback has been removed; the CD
+    playback API has been removed from SDL 2.0.
+  * Strife's voices.wad is now correctly loaded before PWADs.
+
 -------------------------------------------------------------------
 Tue Jul  4 15:33:15 UTC 2017 - jengelh@inai.de

--- a/chocolate-doom.spec
+++ b/chocolate-doom.spec
@ -1,7 +1,7 @@
 #
 # spec file for package chocolate-doom
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@ -17,9 +17,8 @@


 Name:           chocolate-doom
-Version:        2.3.0
+Version:        3.0.0
 Release:        0
-%define rversion	2.3.0
 Summary:        Conservative DOOM/Heretic/Hexen/Strife source port
 License:        GPL-2.0+
 Group:          Amusements/Games/3D/Shoot
@ -27,8 +26,8 @@ Url:            http://chocolate-doom.org/

 #Git-Clone:	git://github.com/fragglet/chocolate-doom
 #Git-Web:	https://github.com/fragglet/chocolate-doom
-Source:         http://www.chocolate-doom.org/downloads/%rversion/%name-%rversion.tar.gz
-Source2:        http://www.chocolate-doom.org/downloads/%rversion/%name-%rversion.tar.gz.asc
+Source:         http://www.chocolate-doom.org/downloads/%version/%name-%version.tar.gz
+Source2:        http://www.chocolate-doom.org/downloads/%version/%name-%version.tar.gz.asc
 Source3:        %name.keyring
 Patch1:         chdoom-iwaddir.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@ -37,10 +36,14 @@ BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  python
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(SDL_mixer)
-BuildRequires:  pkgconfig(SDL_net)
+BuildRequires:  pkgconfig(SDL2_mixer) >= 2.0.0
+BuildRequires:  pkgconfig(SDL2_net) >= 2.0.0
+%if 0%{?suse_version} >= 1500
+# Leap 42.X does not have this
+BuildRequires:  pkgconfig(libpng) >= 1.6.10
+%endif
 BuildRequires:  pkgconfig(samplerate)
-BuildRequires:  pkgconfig(sdl) >= 1.1.3
+BuildRequires:  pkgconfig(sdl2) >= 2.0.1
 Provides:       chocolate-heretic = %version
 Provides:       chocolate-hexen = %version
 Provides:       chocolate-strife = %version
@ -49,16 +52,9 @@ Provides:       chocolate-strife = %version
 Chocolate Doom is a Doom source port with focus on accurate
 reproduction of the original DOS version of Doom and other games
 based on the Doom engine, in a form that can be run on modern
-computers. Originally, Chocolate Doom was only a Doom source port.
-The project now includes ports of Heretic and Hexen, and Strife.
-
-Chocolate Doom's aims are:
-
- * Accurate reproduction of the original DOS versions of the games,
-   including bugs.
- * Compatibility with the DOS demo, configuration and savegame files.
- * To provide an accurate retro "feel" (display and input should
-   behave the same).
+computers. Originally, Chocolate Doom was only a source port for
+Doom. The project now includes ports of Heretic and Hexen, and
+Strife.

 %package bash-completion
 Summary:        Chocolate Doom command line completion support for bash
@ -70,7 +66,7 @@ Supplements:    packageand(chocolate-doom:bash-completion)
 Additions for bash-completion to support chocolate-doom.

 %prep
-%setup -Tqb0 -n %name-%rversion
+%setup -Tqb0
 %patch -P 1 -p1

 %build