Hello community, here is the log from the commit of package chocolate-doom for openSUSE:Factory checked in at 2015-11-10 10:03:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chocolate-doom (Old) and /work/SRC/openSUSE:Factory/.chocolate-doom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chocolate-doom" Changes: -------- --- /work/SRC/openSUSE:Factory/chocolate-doom/chocolate-doom.changes 2015-04-30 11:50:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes 2015-11-10 10:03:11.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Nov 7 10:04:03 UTC 2015 - [email protected] + +- Update to new upstream release 2.2.1 +* The Hexen four level demo IWAD is now supported. +* The Doom reload hack has been added back. +* OPL music playback has been improved in a number of ways to + match the behavior of Vanilla Doom's DMX library much more + closely. OPL3 playback is also now supported. +- Drop chdoom-nonvoid.diff (included upstream), + drop chdoom-prng.diff (PRNG impl. was switched) + +------------------------------------------------------------------- Old: ---- chdoom-nonvoid.diff chdoom-prng.diff chocolate-doom-2.1.0.tar.gz chocolate-doom-2.1.0.tar.gz.asc New: ---- chocolate-doom-2.2.1.tar.gz chocolate-doom-2.2.1.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chocolate-doom.spec ++++++ --- /var/tmp/diff_new_pack.VQAIjs/_old 2015-11-10 10:03:12.000000000 +0100 +++ /var/tmp/diff_new_pack.VQAIjs/_new 2015-11-10 10:03:12.000000000 +0100 @@ -17,9 +17,9 @@ Name: chocolate-doom -Version: 2.1 +Version: 2.2.1 Release: 0 -%define rversion 2.1.0 +%define rversion 2.2.1 Summary: Conservative DOOM/Heretic/Hexen/Strife source port License: GPL-2.0+ Group: Amusements/Games/3D/Shoot @@ -31,8 +31,6 @@ Source2: http://www.chocolate-doom.org/downloads/%rversion/%name-%rversion.tar.gz.asc Source3: %name.keyring Patch1: chdoom-iwaddir.diff -Patch2: chdoom-nonvoid.diff -Patch3: chdoom-prng.diff Patch4: chdoom-date.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -42,7 +40,6 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(SDL_mixer) BuildRequires: pkgconfig(SDL_net) -BuildRequires: pkgconfig(libcrypto) >= 0.9.7 BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sdl) >= 1.1.3 Provides: chocolate-heretic = %version @@ -66,7 +63,7 @@ %prep %setup -Tqb0 -n %name-%rversion -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%patch -P 1 -P 4 -p1 %build autoreconf -fi @@ -75,21 +72,22 @@ %install b="%buildroot"; -make install DESTDIR="$b" iconsdir="%_datadir/icons/hicolor/64x64/apps" \ - docdir="%_docdir/%name"; -mkdir -p "$b/%_bindir"; -mv "$b/%_prefix/games"/* "$b/%_bindir/"; +%make_install iconsdir="%_datadir/icons/hicolor/64x64/apps" \ + docdir="%_docdir/%name" +mkdir -p "$b/%_bindir" +mv "$b/%_prefix/games"/* "$b/%_bindir/" rm -f "$b/%_docdir/%name/INSTALL" %suse_update_desktop_file -r chocolate-setup chocolate-setup Game ActionGame %fdupes %buildroot/%_prefix %post -echo "INFO: %name: The global IWAD directory is %_datadir/doom."; +echo "INFO: %name: The global IWAD directory is %_datadir/doom." %files %defattr(-,root,root) %_bindir/chocolate-* %_mandir/man*/* +%_datadir/appdata/ %_datadir/applications/* %_datadir/icons/* %_docdir/chocolate-*/ ++++++ chdoom-iwaddir.diff ++++++ --- /var/tmp/diff_new_pack.VQAIjs/_old 2015-11-10 10:03:12.000000000 +0100 +++ /var/tmp/diff_new_pack.VQAIjs/_new 2015-11-10 10:03:12.000000000 +0100 @@ -2,25 +2,28 @@ Date: 2013-05-02 09:45:54.544886176 +0200 Upstream: maybe - this patch is quite specific to openSUSE +Make sure we always scan /usr paths for IWADs too, even if +XDG_DATA_DIRS is set. + prboom-plus and doomsday (in openSUSE) look in /usr/share/doom for IWADs, and so should chocolate-doom. --- - src/d_iwad.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/d_iwad.c | 4 ++++ + 1 file changed, 4 insertions(+) -Index: chocolate-doom-1.7.0/src/d_iwad.c +Index: chocolate-doom-2.2.1/src/d_iwad.c =================================================================== ---- chocolate-doom-1.7.0.orig/src/d_iwad.c -+++ chocolate-doom-1.7.0/src/d_iwad.c -@@ -556,8 +556,9 @@ static void BuildIWADDirList(void) - - // Standard places where IWAD files are installed under Unix. - -- AddIWADDir("/usr/share/games/doom"); - AddIWADDir("/usr/local/share/games/doom"); -+ AddIWADDir("/usr/share/games/doom"); -+ AddIWADDir("/usr/share/doom"); - - #endif +--- chocolate-doom-2.2.1.orig/src/d_iwad.c ++++ chocolate-doom-2.2.1/src/d_iwad.c +@@ -633,6 +633,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"); ++ ++ env = "/usr/local/share:/usr/share"; ++ AddIWADPath(env, "/games/doom"); ++ AddIWADPath(env, "/doom"); + } + // ++++++ chocolate-doom-2.1.0.tar.gz -> chocolate-doom-2.2.1.tar.gz ++++++ ++++ 18969 lines of diff (skipped)
