From 085e5f7b46a575b4da2189b7475729b4fdc71c9d98d5efd672bfc6926e820ba8 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sat, 26 Mar 2016 22:08:34 +0000 Subject: [PATCH 1/2] Accepting request 380052 from home:Mailaender:branches:games new upstream release, don't recommend non-existing prboom (we have multiple alternatives now) OBS-URL: https://build.opensuse.org/request/show/380052 OBS-URL: https://build.opensuse.org/package/show/games/freedoom?expand=0&rev=16 --- freedoom-0.10.1.zip | 3 +++ freedoom-iwad-v0.8.zip | 3 --- freedoom-ultimate-v0.8.zip | 3 --- freedoom.changes | 16 ++++++++++++++++ freedoom.desktop | 10 ---------- freedoom.png | 3 --- freedoom.spec | 34 +++++++++------------------------- 7 files changed, 28 insertions(+), 44 deletions(-) create mode 100644 freedoom-0.10.1.zip delete mode 100644 freedoom-iwad-v0.8.zip delete mode 100644 freedoom-ultimate-v0.8.zip delete mode 100644 freedoom.desktop delete mode 100644 freedoom.png diff --git a/freedoom-0.10.1.zip b/freedoom-0.10.1.zip new file mode 100644 index 0000000..207d5ba --- /dev/null +++ b/freedoom-0.10.1.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d20c4b458b6966a58f8f1d9d67db67999364a66e67616e2c320d01b396338da +size 18496121 diff --git a/freedoom-iwad-v0.8.zip b/freedoom-iwad-v0.8.zip deleted file mode 100644 index 5e116c3..0000000 --- a/freedoom-iwad-v0.8.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7df5ff4bde668132d22351435b776e5cd2defcd61a030345b0bc855b96888530 -size 10147511 diff --git a/freedoom-ultimate-v0.8.zip b/freedoom-ultimate-v0.8.zip deleted file mode 100644 index 88dfc6e..0000000 --- a/freedoom-ultimate-v0.8.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f2002deb9ceaa566cf5fa512cd35f1b604fd999ab6933bf3ab896fe890931b9 -size 7567242 diff --git a/freedoom.changes b/freedoom.changes index e193365..7c896f3 100644 --- a/freedoom.changes +++ b/freedoom.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Mar 26 08:01:04 UTC 2016 - mailaender@opensuse.org + +- Update to new upstream release 0.10.1 + * Brand new status bar. + * New sprites for the serpent and orb monster. + * New HUD graphics for the single- and double-barrel shotguns, missile launcher, and SKAG. + * New pain sounds for many monsters and the player. + * New maps in Phase 1 and Phase 2. + * New file names no longer conflict with Doom's + * FreeDM and Phase 1 have grown out of the shadows of the project and have seen rapid advances. + * New text font to replace the old one in all menus, in-game text, and status-bar HUD. + * New zombie, shotgun zombie, and assault tripod sprites by a skilled pixel artist. + * New sounds for the dark soldier. + * More complete support for Final Doom mods, adding many more textures missing to support mods for both TNT: Evilution and The Plutonia Experiment. + ------------------------------------------------------------------- Fri Jan 3 02:53:54 UTC 2014 - jengelh@inai.de diff --git a/freedoom.desktop b/freedoom.desktop deleted file mode 100644 index 255e3aa..0000000 --- a/freedoom.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Freedoom -GenericName=Free Doom -Comment=A new set of Doom levels -Exec=prboom -iwad /usr/share/doom/freedoom.wad -Icon=freedoom -Terminal=false -Type=Application -Categories=Game;ActionGame; -Version=1.0 diff --git a/freedoom.png b/freedoom.png deleted file mode 100644 index fb2370b..0000000 --- a/freedoom.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:114d2e63ed19fab0d749d4c95dc60a9e0f93dcb4433029493f675ce6fd132721 -size 4896 diff --git a/freedoom.spec b/freedoom.spec index 3992195..b1e8f08 100644 --- a/freedoom.spec +++ b/freedoom.spec @@ -1,7 +1,7 @@ # # spec file for package freedoom # -# 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 @@ -17,25 +17,16 @@ Name: freedoom -Version: 0.8 +Version: 0.10.1 Release: 0 Summary: Replacement game files for Doom game engines License: BSD-3-Clause Group: Amusements/Games/3D/Shoot -Url: http://nongnu.org/freedoom/ - -#Git-Web: http://github.com/freedoom/freedoom -#Git-Clone: git://github.com/freedoom/freedoom -Source: http://download.savannah.gnu.org/releases/freedoom/freedoom-iwad/freedoom-iwad-v%version.zip -Source3: http://download.savannah.gnu.org/releases/freedoom/freedoom-iwad/ultimate/freedoom-ultimate-v%version.zip -Source5: freedoom.desktop -Source6: freedoom.png +Url: https://freedoom.github.io/ +Source: https://github.com/freedoom/freedoom/releases/download/v%{version}/freedoom-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: unzip -BuildRequires: update-desktop-files -Recommends: prboom -%define waddir %_datadir/doom %description A set of game resources for the DOOM game engine. While the Doom @@ -45,25 +36,18 @@ to create a free alternative. Combined with the GPL-licensed Doom source code, this will result in a completely free Doom-based game. %prep -%setup -Tcq -a0 -a3 +%setup -q %build # Game data files. Nothing to build! %install -b="%buildroot" -install -Dpm0644 "freedoom-iwad-v%version/doom2.wad" "$b/%waddir/freedoom.wad" -install -Dpm0644 "freedoom-ultimate-v%version/doom.wad" "$b/%waddir/freedoom-ultimate.wad" -mkdir -p "$b/%_docdir/%name" -cp "freedoom-iwad-v%version"/{COPYING,CREDITS,README.html} \ - "$b/%_docdir/%name/" -%suse_update_desktop_file -i %name +install -Dpm0644 freedoom1.wad %{buildroot}%{_datadir}/doom/freedoom1.wad +install -Dpm0644 freedoom2.wad %{buildroot}%{_datadir}/doom/freedoom2.wad %files %defattr(-,root,root) -%waddir/ -%_docdir/%name/ -%_datadir/applications/*.desktop -%_datadir/pixmaps/*.png +%doc COPYING CREDITS README.html +%{_datadir}/doom/ %changelog From 6976f3e85daba38b5d3e70465fc395389db5a4f55a704dd0ca28423dfc24e5e0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 29 Mar 2016 13:17:55 +0000 Subject: [PATCH 2/2] Restore Git links and Recommends (prboom is provided by prboom-plus) OBS-URL: https://build.opensuse.org/package/show/games/freedoom?expand=0&rev=17 --- freedoom.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/freedoom.spec b/freedoom.spec index b1e8f08..132ea20 100644 --- a/freedoom.spec +++ b/freedoom.spec @@ -23,10 +23,14 @@ Summary: Replacement game files for Doom game engines License: BSD-3-Clause Group: Amusements/Games/3D/Shoot Url: https://freedoom.github.io/ -Source: https://github.com/freedoom/freedoom/releases/download/v%{version}/freedoom-%{version}.zip + +#Git-Web: http://github.com/freedoom/freedoom +#Git-Clone: git://github.com/freedoom/freedoom +Source: https://github.com/freedoom/freedoom/releases/download/v%version/freedoom-%version.zip BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: unzip +Recommends: prboom-plus %description A set of game resources for the DOOM game engine. While the Doom @@ -42,12 +46,15 @@ source code, this will result in a completely free Doom-based game. # Game data files. Nothing to build! %install -install -Dpm0644 freedoom1.wad %{buildroot}%{_datadir}/doom/freedoom1.wad -install -Dpm0644 freedoom2.wad %{buildroot}%{_datadir}/doom/freedoom2.wad +install -Dpm0644 freedoom1.wad %buildroot/%_datadir/doom/freedoom1.wad +install -Dpm0644 freedoom2.wad %buildroot/%_datadir/doom/freedoom2.wad + +%post +echo "NOTE: FreeDoom WAD files are no longer named doom.wad/doom2.wad, and you may need to explicitly specify them now when starting a Doom engine." %files %defattr(-,root,root) %doc COPYING CREDITS README.html -%{_datadir}/doom/ +%_datadir/doom/ %changelog