Accepting request 174236 from games

- Search /usr/share/doom for IWADs as well (bnc#818102)
- Remove unnecessary INSTALL file

OBS-URL: https://build.opensuse.org/request/show/174236
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chocolate-doom?expand=0&rev=3

chdoom-iwaddir.diff

@@ -0,0 +1,26 @@
+From: Jan Engelhardt <jengelh@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
+ 

chocolate-doom.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  2 07:45:59 UTC 2013 - jengelh@inai.de
+
+- Search /usr/share/doom for IWADs as well (bnc#818102)
+- Remove unnecessary INSTALL file
+
 -------------------------------------------------------------------
 Mon Jun 11 20:58:25 UTC 2012 - jengelh@inai.de
 

chocolate-doom.spec

@@ -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 @@ 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
+Patch1:         chdoom-iwaddir.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libSDL-devel >= 1.1.3
 BuildRequires:  libSDL_mixer-devel
@@ -47,6 +50,7 @@ as possible to the original DOS Doom executables. It aims to:
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
 %configure
@@ -58,6 +62,7 @@ make install DESTDIR="$b" 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
 
 %files
@@ -66,6 +71,6 @@ mv "$b/%_prefix/games"/* "$b/%_bindir/";
 %_mandir/man*/*
 %_datadir/applications/*
 %_datadir/icons/*
-%_docdir/%name
+%_docdir/%name/
 
 %changelog