Accepting request 1042670 from games

OBS-URL: https://build.opensuse.org/request/show/1042670
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cdogs-sdl?expand=0&rev=20

cdogs-sdl-1.2.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20ed6d261dcc1a6c5f197ffa49aeb2b9c30d2ece514745b144c6ebaeada9bcaf
-size 35018104

cdogs-sdl-1.4.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4030bd8f6168b8f7ee152d0edb1d7a4b75920b7b7fb19a2f7e834508af9631cd
+size 35203975

cdogs-sdl.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Dec 13 11:15:38 UTC 2022 - Andrea Manzini <andrea.manzini@suse.com>
+
+- Update to version 1.4.0 
+  * Fix Spear of Destiny compatibility with steam Wolfenstein 3D
+  * Improve several campaigns with auto-melee weapons (Doom, Wolf3D+SoD)
+
+- Update to version 1.3.1
+  * Persistent lives, fix gas bomb poison lasting forever
+
+- Update to version 1.3.0
+  * Fix missing controls in editor, and some animation effects and sounds
+
+- Add fix-env-script-interpreter.patch
+- Add cdogs-sdl.rpmlintrc to filter out warning on hidden data directory
+- Remove fix-source-file-directory.patch
+
 -------------------------------------------------------------------
 Fri Dec  3 15:08:13 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
 

cdogs-sdl.rpmlintrc

@@ -0,0 +1,2 @@
+# game requires data in this hidden folder
+addFilter("W: hidden-file-or-dir /usr/share/cdogs-sdl/data/.wolf3d")

cdogs-sdl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cdogs-sdl
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,18 @@
 
 
 Name:           cdogs-sdl
-Version:        1.2.0
+Version:        1.4.0
 Release:        0
 Summary:        Classic overhead run-and-gun game
 License:        BSD-2-Clause AND GPL-2.0-only AND CC-BY-3.0 AND CC-BY-SA-3.0
 Group:          Amusements/Games/Action/Shoot
 URL:            https://cxong.github.io/cdogs-sdl
 Source:         https://github.com/cxong/cdogs-sdl/archive/%{version}/%{name}-%{version}.tar.gz
+Source1:        cdogs-sdl.rpmlintrc
 Patch0:         fix-build.patch
 # PATCH-FIX-UPSTREAM fix-source-file-directory.patch -- https://github.com/cxong/cdogs-sdl/issues/729
-Patch1:         fix-source-file-directory.patch
+#Patch1:         fix-source-file-directory.patch
+Patch1:         fix-env-script-interpreter.patch
 BuildRequires:  cmake >= 3.12
 BuildRequires:  enet-devel
 BuildRequires:  fdupes
@@ -63,6 +65,7 @@ rm -rf src/cdogs/enet
 %cmake_install
 rm %{buildroot}%{_datadir}/cdogs-sdl/README.md
 %fdupes %{buildroot}%{_datadir}
+find %{buildroot}%{_datadir}/cdogs-sdl/ -name '*.sh' | xargs chmod a+x
 
 %check
 %ctest

fix-build.patch

@@ -1,8 +1,8 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
+Index: cdogs-sdl-1.4.0/CMakeLists.txt
-index 8429585..94f80aa 100644
+===================================================================
---- a/CMakeLists.txt
+--- cdogs-sdl-1.4.0.orig/CMakeLists.txt
-+++ b/CMakeLists.txt
++++ cdogs-sdl-1.4.0/CMakeLists.txt
-@@ -148,6 +148,9 @@ if(NOT DEFINED CDOGS_DATA_DIR)
+@@ -147,6 +147,9 @@ if(NOT DEFINED CDOGS_DATA_DIR)
  	endif()
  endif()
  message("Data dir is ${CDOGS_DATA_DIR}")
@@ -12,7 +12,7 @@ index 8429585..94f80aa 100644
  if(WIN32)
  	set(CDOGS_CFG_DIR "C-Dogs SDL/")
  else()
-@@ -200,7 +203,6 @@ elseif(APPLE)
+@@ -199,7 +202,6 @@ elseif(APPLE)
  	set(INSTALL_PREFIX "cdogs-sdl")
  else()
  	set(LIB_EXTENSION ".so")

fix-env-script-interpreter.patch

@@ -0,0 +1,9 @@
+diff --color -ur cdogs-sdl-1.4.0-orig/graphics/wall/generate.sh cdogs-sdl-1.4.0/graphics/wall/generate.sh
+--- cdogs-sdl-1.4.0-orig/graphics/wall/generate.sh	2022-11-13 07:10:17.000000000 +0100
++++ cdogs-sdl-1.4.0/graphics/wall/generate.sh	2022-12-13 12:00:34.327347621 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/usr/bin/bash
+ # Use this script to generate all the other versions of wall tiles, given a complete "o" tile
+ # Use "plasteel" as a template
+ name=$1

fix-source-file-directory.patch

@@ -1,17 +0,0 @@
-diff -Nur old/src/proto/CMakeLists.txt cdogs-sdl-1.2.0/src/proto/CMakeLists.txt
---- old/src/proto/CMakeLists.txt	2021-12-02 11:16:04.000000000 +0100
-+++ cdogs-sdl-1.2.0/src/proto/CMakeLists.txt	2021-12-03 18:43:18.315210954 +0100
-@@ -4,11 +4,12 @@
- add_definitions(-DPB_FIELD_16BIT)	# Allow larger field numbers in nanopb
- 
- # Note: uncomment below line to build new proto files
--# nanopb_generate_cpp(PROTO_SRCS PROTO_HDRS msg.proto)
-+nanopb_generate_cpp(PROTO_SRCS PROTO_HDRS msg.proto)
- set(PROTO_SRCS "msg.pb.c" "nanopb/pb_decode.c" "nanopb/pb_encode.c" "nanopb/pb_common.c")
- set(PROTO_HDRS "msg.pb.h" "nanopb/pb_decode.h" "nanopb/pb_encode.c" "nanopb/pb_common.c" "nanopb/pb.h")
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS}
-+    DIRECTORY .
-     PROPERTIES GENERATED TRUE)
- add_library(cdogs_proto STATIC ${PROTO_SRCS} ${PROTO_HDRS} msg.options msg.proto)