commit chocolate-doom for openSUSE:Factory

2020-07-02 Thread root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2020-07-03 00:11:05

Comparing /work/SRC/openSUSE:Factory/chocolate-doom (Old)
 and  /work/SRC/openSUSE:Factory/.chocolate-doom.new.3060 (New)


Package is "chocolate-doom"

Fri Jul  3 00:11:05 2020 rev:16 rq:818147 version:3.0.1

Changes:

--- /work/SRC/openSUSE:Factory/chocolate-doom/chocolate-doom.changes
2020-06-07 21:38:37.813509421 +0200
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new.3060/chocolate-doom.changes  
2020-07-03 00:13:21.980256038 +0200
@@ -1,0 +2,8 @@
+Wed Jul  1 15:43:07 UTC 2020 - Jan Engelhardt 
+
+- Update to release 3.0.1
+  * Fixed a bug where a client in a networked game can
+cause a stack-based buffer overflow on the server
+[CVE-2020-14983, boo#1173595]
+
+---

Old:

  chocolate-doom-3.0.0.tar.gz
  chocolate-doom-3.0.0.tar.gz.asc

New:

  chocolate-doom-3.0.1.tar.gz
  chocolate-doom-3.0.1.tar.gz.asc



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.oVmEHc/_old  2020-07-03 00:13:23.508261097 +0200
+++ /var/tmp/diff_new_pack.oVmEHc/_new  2020-07-03 00:13:23.51226 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   chocolate-doom
-Version:3.0.0
+Version:3.0.1
 Release:0
 Summary:Conservative DOOM/Heretic/Hexen/Strife source port
 License:GPL-2.0-or-later

++ chocolate-doom-3.0.0.tar.gz -> chocolate-doom-3.0.1.tar.gz ++
 6950 lines of diff (skipped)
retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/chocolate-doom-3.0.0/NEWS.md new/chocolate-doom-3.0.1/NEWS.md
--- old/chocolate-doom-3.0.0/NEWS.md2017-12-30 22:20:55.0 +0100
+++ new/chocolate-doom-3.0.1/NEWS.md2020-06-25 05:15:40.0 +0200
@@ -1,3 +1,11 @@
+## 3.0.1 (2020-06-24)
+
+  This is a point release that fixes a security vulnerability
+  (CVE-2020-14983). An unchecked field in the Chocolate Doom server logic
+  could allow a malicious attacker to trigger arbitrary code execution
+  against Chocolate Doom servers. Thanks to Michał Dardas from LogicalTrust
+  for discovering the vulnerability.
+
 ## 3.0.0 (2017-12-30)
 
   Chocolate Doom 3.0 is a new major revision. The main change is that
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/chocolate-doom-3.0.0/autotools/ar-lib 
new/chocolate-doom-3.0.1/autotools/ar-lib
--- old/chocolate-doom-3.0.0/autotools/ar-lib   1970-01-01 01:00:00.0 
+0100
+++ new/chocolate-doom-3.0.1/autotools/ar-lib   2020-06-25 04:54:11.0 
+0200
@@ -0,0 +1,271 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2019-07-04.01; # UTC
+
+# Copyright (C) 2010-2020 Free Software Foundation, Inc.
+# Written by Peter Rosin .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+
+# func_error message
+func_error ()
+{
+  echo "$me: $1" 1>&2
+  exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+  if test -z "$file_conv"; then
+   # lazily

commit chocolate-doom for openSUSE:Factory

2020-06-07 Thread root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2020-06-07 21:38:14

Comparing /work/SRC/openSUSE:Factory/chocolate-doom (Old)
 and  /work/SRC/openSUSE:Factory/.chocolate-doom.new.3606 (New)


Package is "chocolate-doom"

Sun Jun  7 21:38:14 2020 rev:15 rq:812128 version:3.0.0

Changes:

--- /work/SRC/openSUSE:Factory/chocolate-doom/chocolate-doom.changes
2018-11-26 10:22:07.981603933 +0100
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new.3606/chocolate-doom.changes  
2020-06-07 21:38:37.813509421 +0200
@@ -1,0 +2,5 @@
+Sat Jun  6 23:53:33 UTC 2020 - Jan Engelhardt 
+
+- Set CFLAGS+=-fcommon.
+
+---



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.ubYT1P/_old  2020-06-07 21:38:39.745515544 +0200
+++ /var/tmp/diff_new_pack.ubYT1P/_new  2020-06-07 21:38:39.749515557 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package chocolate-doom
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,15 +22,13 @@
 Summary:Conservative DOOM/Heretic/Hexen/Strife source port
 License:GPL-2.0-or-later
 Group:  Amusements/Games/3D/Shoot
-Url:http://chocolate-doom.org/
+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/%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
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
@@ -71,7 +69,7 @@
 
 %build
 autoreconf -fi
-%configure
+%configure CFLAGS="%optflags -fcommon"
 make %{?_smp_mflags}
 
 %install
@@ -87,7 +85,6 @@
 echo "INFO: %name: The global IWAD directory is %_datadir/doom."
 
 %files
-%defattr(-,root,root)
 %_bindir/chocolate-*
 %_mandir/man*/*
 %_datadir/appdata/
@@ -96,7 +93,6 @@
 %_docdir/chocolate-*/
 
 %files bash-completion
-%defattr(-,root,root)
 %_datadir/bash-completion/
 
 %changelog

commit chocolate-doom for openSUSE:Factory

2018-11-26 Thread root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2018-11-26 10:20:37

Comparing /work/SRC/openSUSE:Factory/chocolate-doom (Old)
 and  /work/SRC/openSUSE:Factory/.chocolate-doom.new.19453 (New)


Package is "chocolate-doom"

Mon Nov 26 10:20:37 2018 rev:14 rq:648884 version:3.0.0

Changes:

--- /work/SRC/openSUSE:Factory/chocolate-doom/chocolate-doom.changes
2018-01-13 21:47:02.835753741 +0100
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new.19453/chocolate-doom.changes 
2018-11-26 10:22:07.981603933 +0100
@@ -1,0 +2,5 @@
+Wed Nov 14 08:29:31 UTC 2018 - Jan Engelhardt 
+
+- Update description.
+
+---



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.E4Xdjo/_old  2018-11-26 10:22:08.921602828 +0100
+++ /var/tmp/diff_new_pack.E4Xdjo/_new  2018-11-26 10:22:08.925602823 +0100
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -20,7 +20,7 @@
 Version:3.0.0
 Release:0
 Summary:Conservative DOOM/Heretic/Hexen/Strife source port
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Amusements/Games/3D/Shoot
 Url:http://chocolate-doom.org/
 
@@ -51,10 +51,10 @@
 %description
 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 source port for
-Doom. The project now includes ports of Heretic and Hexen, and
-Strife.
+based on the Doom engine. There are no new features, a lack of high
+resolution rendering, and goes as far as to duplicate or recreate
+bugs and crashes found in the DOS executable that were fixed before
+the initial open-sourcing of the Doom engine.
 
 %package bash-completion
 Summary:Chocolate Doom command line completion support for bash

commit chocolate-doom for openSUSE:Factory

2018-01-13 Thread root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2018-01-13 21:47:01

Comparing /work/SRC/openSUSE:Factory/chocolate-doom (Old)
 and  /work/SRC/openSUSE:Factory/.chocolate-doom.new (New)


Package is "chocolate-doom"

Sat Jan 13 21:47:01 2018 rev:13 rq:563453 version:3.0.0

Changes:

--- /work/SRC/openSUSE:Factory/chocolate-doom/chocolate-doom.changes
2017-08-24 18:38:16.252803884 +0200
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2018-01-13 21:47:02.835753741 +0100
@@ -1,0 +2,14 @@
+Wed Jan 10 11:51:11 UTC 2018 - jeng...@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.
+
+---

Old:

  chocolate-doom-2.3.0.tar.gz
  chocolate-doom-2.3.0.tar.gz.asc

New:

  chocolate-doom-3.0.0.tar.gz
  chocolate-doom-3.0.0.tar.gz.asc



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.OnAHH7/_old  2018-01-13 21:47:03.547720550 +0100
+++ /var/tmp/diff_new_pack.OnAHH7/_new  2018-01-13 21:47:03.551720364 +0100
@@ -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 @@
 
 #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:  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 @@
 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 @@
 Additions for bash-completion to support chocolate-doom.
 
 %prep
-%setup -Tqb0 -n %name-%rversion
+%setup -Tqb0
 %patch -P 1 -p1
 
 %build

++ chdoom-iwaddir.diff ++
--- /var/tmp/diff_new_pack.OnAHH7/_old  2018-01-13 21:47:03.575719245 +0100
+++ /var/tmp/diff_new_pack.OnAHH7/_new  2018-01-13 21:47:03.575719245

commit chocolate-doom for openSUSE:Factory

2017-08-24 Thread root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2017-08-24 18:38:09

Comparing /work/SRC/openSUSE:Factory/chocolate-doom (Old)
 and  /work/SRC/openSUSE:Factory/.chocolate-doom.new (New)


Package is "chocolate-doom"

Thu Aug 24 18:38:09 2017 rev:12 rq:510106 version:2.3.0

Changes:

--- /work/SRC/openSUSE:Factory/chocolate-doom/chocolate-doom.changes
2016-11-16 13:33:51.0 +0100
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2017-08-24 18:38:16.252803884 +0200
@@ -1,0 +2,21 @@
+Tue Jul  4 15:33:15 UTC 2017 - jeng...@inai.de
+
+- Update to new upstream release 2.3.0 (2016-12-29)
+  * Pitch-shifting from early versions of Doom, Heretic, and Hexen
+is now supported.
+  * Aspect ratio-corrected 1600×1200 PNGs are now written.
+  * OPL emulation is more accurate.
+  * DMX bugs with GUS cards are now better emulated.
+  * Checksum calculations are fixed on big endian systems, allowing
+multiplayer games to be played in mixed little/big-endian
+environments.
+  * The vanilla limit of 4046 lumps per WAD is now enforced.
+  * Solidsegs overflow is emulated like in vanilla.
+  * It is now possible to start multiplayer Chex Quest games.
+  * Versions 1.666, 1.7, and 1.8 are emulated.
+  * An issue was fixed where the game crashed while killing the
+Wraithverge in 64-bit builds.
+- Drop chdoom-date.diff (no longer needed), drop
+  chdoom-sdlsound.diff (merged upstream).
+
+---

Old:

  chdoom-date.diff
  chdoom-sdlsound.diff
  chocolate-doom-2.2.1.tar.gz
  chocolate-doom-2.2.1.tar.gz.asc

New:

  chocolate-doom-2.3.0.tar.gz
  chocolate-doom-2.3.0.tar.gz.asc



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.OxHSxF/_old  2017-08-24 18:38:17.096684998 +0200
+++ /var/tmp/diff_new_pack.OxHSxF/_new  2017-08-24 18:38:17.096684998 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package chocolate-doom
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,9 @@
 
 
 Name:   chocolate-doom
-Version:2.2.1
+Version:2.3.0
 Release:0
-%define rversion   2.2.1
+%define rversion   2.3.0
 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
-Patch4: chdoom-date.diff
-Patch5: chdoom-sdlsound.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -62,9 +60,18 @@
  * To provide an accurate retro "feel" (display and input should
behave the same).
 
+%package bash-completion
+Summary:Chocolate Doom command line completion support for bash
+Group:  System/Shells
+BuildArch:  noarch
+Supplements:packageand(chocolate-doom:bash-completion)
+
+%description bash-completion
+Additions for bash-completion to support chocolate-doom.
+
 %prep
 %setup -Tqb0 -n %name-%rversion
-%patch -P 1 -P 4 -P 5 -p1
+%patch -P 1 -p1
 
 %build
 autoreconf -fi
@@ -76,9 +83,8 @@
 %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
+rm -f "$b/%_datadir/applications/chocolate-setup.desktop" # has wrong paths
 %fdupes %buildroot/%_prefix
 
 %post
@@ -93,4 +99,8 @@
 %_datadir/icons/*
 %_docdir/chocolate-*/
 
+%files bash-completion
+%defattr(-,root,root)
+%_datadir/bash-completion/
+
 %changelog

++ chdoom-iwaddir.diff ++
--- /var/tmp/diff_new_pack.OxHSxF/_old  2017-08-24 18:38:17.120681617 +0200
+++ /var/tmp/diff_new_pack.OxHSxF/_new  2017-08-24 18:38:17.120681617 +0200
@@ -12,11 +12,11 @@
  src/d_iwad.c |4 
  1 file changed, 4 insertions(+)
 
-Index: chocolate-doom-2.2.1/src/d_iwad.c
+Index: chocolate-doom-2.3.0/src/d_iwad.c
 ===
 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)
+--- 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

commit chocolate-doom for openSUSE:Factory

2016-11-16 Thread h_root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2016-11-16 13:33:50

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-11-10 10:03:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2016-11-16 13:33:51.0 +0100
@@ -1,0 +2,6 @@
+Wed Nov 16 00:18:05 UTC 2016 - jeng...@inai.de
+
+- Add chdoom-sdlsound.diff to resolve build error with new
+  libsamplerate
+
+---

New:

  chdoom-sdlsound.diff



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.4N8Sa6/_old  2016-11-16 13:33:52.0 +0100
+++ /var/tmp/diff_new_pack.4N8Sa6/_new  2016-11-16 13:33:52.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package chocolate-doom
 #
-# Copyright (c) 2015 SUSE LINUX 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
@@ -32,6 +32,7 @@
 Source3:%name.keyring
 Patch1: chdoom-iwaddir.diff
 Patch4: chdoom-date.diff
+Patch5: chdoom-sdlsound.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -63,15 +64,15 @@
 
 %prep
 %setup -Tqb0 -n %name-%rversion
-%patch -P 1 -P 4 -p1
+%patch -P 1 -P 4 -P 5 -p1
 
 %build
 autoreconf -fi
 %configure
-make %{?_smp_mflags};
+make %{?_smp_mflags}
 
 %install
-b="%buildroot";
+b="%buildroot"
 %make_install iconsdir="%_datadir/icons/hicolor/64x64/apps" \
docdir="%_docdir/%name"
 mkdir -p "$b/%_bindir"

++ chdoom-sdlsound.diff ++
>From ffb5656588db391889890c65c206b5e170c084e7 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath 
Date: Mon, 24 Oct 2016 15:30:18 +0200
Subject: [PATCH] i_sdlsound.c: fix compilation with libsamplerate 0.1.9

This new version has const-corrected the data_in field, fixes #788
---
 src/i_sdlsound.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/i_sdlsound.c b/src/i_sdlsound.c
index 79a15db..2d7a620 100644
--- a/src/i_sdlsound.c
+++ b/src/i_sdlsound.c
@@ -339,6 +339,7 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
int length)
 {
 SRC_DATA src_data;
+float *data_in;
 uint32_t i, abuf_index=0, clipped=0;
 //uint32_t alen;
 int retn;
@@ -346,7 +347,8 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
 Mix_Chunk *chunk;
 
 src_data.input_frames = length;
-src_data.data_in = malloc(length * sizeof(float));
+data_in = malloc(length * sizeof(float));
+src_data.data_in = data_in;
 src_data.src_ratio = (double)mixer_freq / samplerate;
 
 // We include some extra space here in case of rounding-up.
@@ -362,7 +364,7 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
 // Unclear whether 128 should be interpreted as "zero" or whether a
 // symmetrical range should be assumed.  The following assumes a
 // symmetrical range.
-src_data.data_in[i] = data[i] / 127.5 - 1;
+data_in[i] = data[i] / 127.5 - 1;
 }
 
 // Do the sound conversion
@@ -430,7 +432,7 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
 expanded[abuf_index++] = cvtval_i;
 }
 
-free(src_data.data_in);
+free(data_in);
 free(src_data.data_out);
 
 if (clipped > 0)
-- 
2.10.2

commit chocolate-doom for openSUSE:Factory

2015-11-10 Thread h_root 
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2015-11-10 10:03:11.0 +0100
@@ -1,0 +2,12 @@
+Sat Nov  7 10:04:03 UTC 2015 - jeng...@inai.de
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.VQAIjs/_new  2015-11-10 10:03:12.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.VQAIjs/_new  2015-11-10 10:03:12.0 +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)
+

commit chocolate-doom for openSUSE:Factory

2015-04-30 Thread h_root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2015-04-30 11:50:44

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
2014-05-13 20:43:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2015-04-30 11:50:46.0 +0200
@@ -1,0 +2,17 @@
+Sat Mar 28 22:16:09 UTC 2015 - jeng...@inai.de
+
+- Update to new upstream release 2.1
+* Chocolate Doom now supports high-quality substitute music packs
+  that are used in place of the original MIDI music tracks.
+* Support for joysticks and gamepads has been significantly
+  improved in this version.
+* OPL MIDI playback has been significantly improved. Multi-track
+  MIDI files now play back properly.
+* The no fog on spawn west Vanilla bug is now correctly
+  emulated.
+* Behavior of older versions of Doom back to v1.666 can now be
+  emulated.
+- Add chdoom-nonvoid.diff, chdoom-prng.diff to quench compiler
+  warnings. Add chdoom-date.diff to kill __DATE__ instances.
+
+---

Old:

  chocolate-doom-2.0.tar.xz

New:

  chdoom-date.diff
  chdoom-nonvoid.diff
  chdoom-prng.diff
  chocolate-doom-2.1.0.tar.gz
  chocolate-doom-2.1.0.tar.gz.asc
  chocolate-doom.keyring



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.531ckv/_old  2015-04-30 11:50:47.0 +0200
+++ /var/tmp/diff_new_pack.531ckv/_new  2015-04-30 11:50:47.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package chocolate-doom
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,9 @@
 
 
 Name:   chocolate-doom
-Version:2.0
+Version:2.1
 Release:0
-%define rversion   2.0
+%define rversion   2.1.0
 Summary:Conservative DOOM/Heretic/Hexen/Strife source port
 License:GPL-2.0+
 Group:  Amusements/Games/3D/Shoot
@@ -27,19 +27,22 @@
 
 #Git-Clone:git://github.com/fragglet/chocolate-doom
 #Git-Web:  https://github.com/fragglet/chocolate-doom
-#Freecode-URL: https://freecode.com/projects/chocolate-doom
-#DL-URL:   
http://chocolate-doom.org/downloads/2.0.0/chocolate-doom-2.0.0.tar.gz
-Source: chocolate-doom-%rversion.tar.xz
+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
+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
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  python
 BuildRequires:  update-desktop-files
-BuildRequires:  xz
 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
@@ -62,8 +65,8 @@
behave the same).
 
 %prep
-%setup -qn %name
-%patch -P 1 -p1
+%setup -Tqb0 -n %name-%rversion
+%patch -P 1 -P 2 -P 3 -P 4 -p1
 
 %build
 autoreconf -fi

++ chdoom-date.diff ++
---
 src/hexen/h2def.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: chocolate-doom-2.1.0/src/hexen/h2def.h
===
--- chocolate-doom-2.1.0.orig/src/hexen/h2def.h
+++ chocolate-doom-2.1.0/src/hexen/h2def.h
@@ -67,9 +67,9 @@
 //#define HEXEN_VERSIONTEXT DVL BETA 10 07 95 // Just an update for Romero
 //#define HEXEN_VERSIONTEXT FINAL 1.0 (10 13 95) // Just an update for Romero
 #ifdef RANGECHECK
-#define HEXEN_VERSIONTEXT Version 1.1 +R __DATE__ (VER_ID)
+#define HEXEN_VERSIONTEXT Version 1.1 +R  (VER_ID)
 #else
-#define HEXEN_VERSIONTEXT Version 1.1 __DATE__ (VER_ID)
+#define HEXEN_VERSIONTEXT Version 1.1  (VER_ID)
 #endif
 
 // all exterior data is defined here
++ chdoom-nonvoid.diff ++
From 51ab62f6fb06b42c80c98ea71ab29d208d10e422 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath fab...@greffrath.com
Date: Tue, 17 Feb 2015 12:00:04 +0100
Subject: [PATCH] setup: fix control reaches end of non-void function
 compiler warning

Actually, it is

commit chocolate-doom for openSUSE:Factory

2014-05-13 Thread h_root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2014-05-13 20:43:19

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
2013-12-22 19:33:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2014-05-13 20:43:21.0 +0200
@@ -1,0 +2,6 @@
+Sun May 11 17:01:43 UTC 2014 - jeng...@inai.de
+
+- Add python to BuildRequires - it is used for manpage generation
+  (was previously implicitly included)
+
+---



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.72x6TR/_old  2014-05-13 20:43:22.0 +0200
+++ /var/tmp/diff_new_pack.72x6TR/_new  2014-05-13 20:43:22.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package chocolate-doom
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
+BuildRequires:  python
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
 BuildRequires:  pkgconfig(SDL_mixer)
@@ -79,6 +80,9 @@
 %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.;
+
 %files
 %defattr(-,root,root)
 %_bindir/chocolate-*

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit chocolate-doom for openSUSE:Factory

2013-12-22 Thread h_root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2013-12-22 19:33:22

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
2013-05-03 09:16:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2013-12-22 19:33:23.0 +0100
@@ -1,0 +2,7 @@
+Tue Dec 10 12:59:24 UTC 2013 - jeng...@inai.de
+
+- Update to new upstream release 2.0
+* Support for three other Doom engine-based games: Heretic, Hexen,
+  and Strife.
+
+---

Old:

  chocolate-doom-1.7.0.tar.xz

New:

  chocolate-doom-2.0.tar.xz



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.4RwdKg/_old  2013-12-22 19:33:24.0 +0100
+++ /var/tmp/diff_new_pack.4RwdKg/_new  2013-12-22 19:33:24.0 +0100
@@ -17,42 +17,55 @@
 
 
 Name:   chocolate-doom
-Version:1.7.0
+Version:2.0
 Release:0
-Summary:Conservative DOOM source port
+%define rversion   2.0
+Summary:Conservative DOOM/Heretic/Hexen/Strife source port
 License:GPL-2.0+
 Group:  Amusements/Games/3D/Shoot
 Url:http://chocolate-doom.org/
 
+#Git-Clone:git://github.com/fragglet/chocolate-doom
+#Git-Web:  https://github.com/fragglet/chocolate-doom
 #Freecode-URL: https://freecode.com/projects/chocolate-doom
-#DL-URL:   
http://downloads.sf.net/chocolate-doom/chocolate-doom-1.7.0.tar.gz
-Source: chocolate-doom-%version.tar.xz
+#DL-URL:   
http://chocolate-doom.org/downloads/2.0.0/chocolate-doom-2.0.0.tar.gz
+Source: chocolate-doom-%rversion.tar.xz
 Patch1: chdoom-iwaddir.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libSDL-devel = 1.1.3
-BuildRequires:  libSDL_mixer-devel
-BuildRequires:  libSDL_net-devel
-BuildRequires:  libsamplerate-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  fdupes
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
+BuildRequires:  pkgconfig(SDL_mixer)
+BuildRequires:  pkgconfig(SDL_net)
+BuildRequires:  pkgconfig(samplerate)
+BuildRequires:  pkgconfig(sdl) = 1.1.3
+Provides:   chocolate-heretic = %version
+Provides:   chocolate-hexen = %version
+Provides:   chocolate-strife = %version
 
 %description
-Chocolate Doom is a Doom source port which aims to behave as closely
-as possible to the original DOS Doom executables. It aims to:
-* be compatible with DOS Doom demos
-* be compatible with DOS Doom configuration files
-* be compatible with DOS Doom savegames
-* be compatible with DOS Doom bugs
-* provide the same feel as DOS Doom (display and input should
-  behave the same)
-* as far as possible, provide all the same features that are
-  available using the DOS 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).
 
 %prep
-%setup -q
+%setup -qn %name
 %patch -P 1 -p1
 
 %build
+autoreconf -fi
 %configure
 make %{?_smp_mflags};
 
@@ -64,13 +77,14 @@
 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
 
 %files
 %defattr(-,root,root)
-%_bindir/*
+%_bindir/chocolate-*
 %_mandir/man*/*
 %_datadir/applications/*
 %_datadir/icons/*
-%_docdir/%name/
+%_docdir/chocolate-*/
 
 %changelog

++ chocolate-doom-1.7.0.tar.xz - chocolate-doom-2.0.tar.xz ++
 386194 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit chocolate-doom for openSUSE:Factory

2013-05-03 Thread h_root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2013-05-03 09:16:55

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
2013-05-02 12:33:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2013-05-03 09:16:58.0 +0200
@@ -4,0 +5 @@
+  + Added chdoom-iwaddir.diff



Other differences:
--
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit chocolate-doom for openSUSE:Factory

2013-05-02 Thread h_root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2013-05-02 12:33:12

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
2013-01-04 11:37:40.0 +0100
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2013-05-02 12:33:14.0 +0200
@@ -1,0 +2,6 @@
+Thu May  2 07:45:59 UTC 2013 - jeng...@inai.de
+
+- Search /usr/share/doom for IWADs as well (bnc#818102)
+- Remove unnecessary INSTALL file
+
+---

New:

  chdoom-iwaddir.diff



Other differences:
--
++ chocolate-doom.spec ++
--- /var/tmp/diff_new_pack.zL2BBp/_old  2013-05-02 12:33:16.0 +0200
+++ /var/tmp/diff_new_pack.zL2BBp/_new  2013-05-02 12:33:16.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package chocolate-doom
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -14,6 +14,8 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+
+
 Name:   chocolate-doom
 Version:1.7.0
 Release:0
@@ -25,6 +27,7 @@
 #Freecode-URL: https://freecode.com/projects/chocolate-doom
 #DL-URL:   
http://downloads.sf.net/chocolate-doom/chocolate-doom-1.7.0.tar.gz
 Source: chocolate-doom-%version.tar.xz
+Patch1: chdoom-iwaddir.diff
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libSDL-devel = 1.1.3
 BuildRequires:  libSDL_mixer-devel
@@ -47,6 +50,7 @@
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
 %configure
@@ -58,6 +62,7 @@
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
 
 %files
@@ -66,6 +71,6 @@
 %_mandir/man*/*
 %_datadir/applications/*
 %_datadir/icons/*
-%_docdir/%name
+%_docdir/%name/
 
 %changelog

++ chdoom-iwaddir.diff ++
From: Jan Engelhardt jeng...@inai.de
Date: 2013-05-02 09:45:54.544886176 +0200
Upstream: maybe - this patch is quite specific to openSUSE

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(-)

Index: chocolate-doom-1.7.0/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
 
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit chocolate-doom for openSUSE:Factory

2013-01-04 Thread h_root 
Hello community,

here is the log from the commit of package chocolate-doom for openSUSE:Factory 
checked in at 2013-01-04 11:37:39

Comparing /work/SRC/openSUSE:Factory/chocolate-doom (Old)
 and  /work/SRC/openSUSE:Factory/.chocolate-doom.new (New)


Package is chocolate-doom, Maintainer is 

Changes:

New Changes file:

--- /dev/null   2012-12-21 01:49:00.356010756 +0100
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes   
2013-01-04 11:37:40.0 +0100
@@ -0,0 +1,17 @@
+---
+Mon Jun 11 20:58:25 UTC 2012 - jeng...@inai.de
+
+- Update to new upstream release 1.7.0
+* Running servers now re-resolve the address of the master server
+  occasionally, to adapt to DNS address changes.
+* A workaround for SDL mouse lag is now only used on Windows
+  (where it is needed)
+* UTF-8 usernames are supported, and Windows usernames with
+  non-ASCII characters are now supported
+* Palette accuracy is reduced to 6 bits per channel, to more
+  accurately emulate the PC VGA hardware
+
+---
+Fri Jun 08 15:42:13 UTC 2011 - jeng...@medozas.de
+
+- Initial package (version 1.6.0) for build.opensuse.org

New:

  chocolate-doom-1.7.0.tar.xz
  chocolate-doom.changes
  chocolate-doom.spec



Other differences:
--
++ chocolate-doom.spec ++
#
# spec file for package chocolate-doom
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An Open Source License is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name:   chocolate-doom
Version:1.7.0
Release:0
Summary:Conservative DOOM source port
License:GPL-2.0+
Group:  Amusements/Games/3D/Shoot
Url:http://chocolate-doom.org/

#Freecode-URL:  https://freecode.com/projects/chocolate-doom
#DL-URL:
http://downloads.sf.net/chocolate-doom/chocolate-doom-1.7.0.tar.gz
Source: chocolate-doom-%version.tar.xz
BuildRoot:  %{_tmppath}/%{name}-%{version}-build
BuildRequires:  libSDL-devel = 1.1.3
BuildRequires:  libSDL_mixer-devel
BuildRequires:  libSDL_net-devel
BuildRequires:  libsamplerate-devel
BuildRequires:  update-desktop-files
BuildRequires:  xz

%description
Chocolate Doom is a Doom source port which aims to behave as closely
as possible to the original DOS Doom executables. It aims to:
* be compatible with DOS Doom demos
* be compatible with DOS Doom configuration files
* be compatible with DOS Doom savegames
* be compatible with DOS Doom bugs
* provide the same feel as DOS Doom (display and input should
  behave the same)
* as far as possible, provide all the same features that are
  available using the DOS version.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags};

%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/;
%suse_update_desktop_file -r chocolate-setup chocolate-setup Game ActionGame

%files
%defattr(-,root,root)
%_bindir/*
%_mandir/man*/*
%_datadir/applications/*
%_datadir/icons/*
%_docdir/%name

%changelog
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org