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.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes       
2013-05-02 12:33:14.000000000 +0200
@@ -1,0 +2,6 @@
+Thu May  2 07:45:59 UTC 2013 - [email protected]
+
+- 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.000000000 +0200
+++ /var/tmp/diff_new_pack.zL2BBp/_new  2013-05-02 12:33:16.000000000 +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 <[email protected]>
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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to