From fca872eb0be5ee2f9ba8f815a0f7beb03bc5cf0faac414488fc3c003d39db398 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Fri, 3 Dec 2021 17:11:24 +0000 Subject: [PATCH 1/2] Accepting request 935538 from home:susnux:branches:games - Update to version 1.2.0 * Fix Spear of Destiny secret level warps * Fix Spear of Destiny missing wall definition * Editor: Fix setting key required for doors - Add fix-source-file-directory.patch OBS-URL: https://build.opensuse.org/request/show/935538 OBS-URL: https://build.opensuse.org/package/show/games/cdogs-sdl?expand=0&rev=42 --- cdogs-sdl-1.1.1.tar.gz | 3 --- cdogs-sdl-1.2.0.tar.gz | 3 +++ cdogs-sdl.changes | 9 +++++++++ cdogs-sdl.spec | 7 ++++--- fix-source-file-directory.patch | 10 ++++++++++ 5 files changed, 26 insertions(+), 6 deletions(-) delete mode 100644 cdogs-sdl-1.1.1.tar.gz create mode 100644 cdogs-sdl-1.2.0.tar.gz create mode 100644 fix-source-file-directory.patch diff --git a/cdogs-sdl-1.1.1.tar.gz b/cdogs-sdl-1.1.1.tar.gz deleted file mode 100644 index 2f8394a..0000000 --- a/cdogs-sdl-1.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1a18efbd128249ac607f7bf04e09e4625d35509209be7e256461f2fabddd98e -size 35073687 diff --git a/cdogs-sdl-1.2.0.tar.gz b/cdogs-sdl-1.2.0.tar.gz new file mode 100644 index 0000000..f56ccac --- /dev/null +++ b/cdogs-sdl-1.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20ed6d261dcc1a6c5f197ffa49aeb2b9c30d2ece514745b144c6ebaeada9bcaf +size 35018104 diff --git a/cdogs-sdl.changes b/cdogs-sdl.changes index 99f6dbb..a8e17a6 100644 --- a/cdogs-sdl.changes +++ b/cdogs-sdl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Dec 3 15:08:13 UTC 2021 - Ferdinand Thiessen + +- Update to version 1.2.0 + * Fix Spear of Destiny secret level warps + * Fix Spear of Destiny missing wall definition + * Editor: Fix setting key required for doors +- Add fix-source-file-directory.patch + ------------------------------------------------------------------- Wed Oct 13 20:03:42 UTC 2021 - Martin Hauke diff --git a/cdogs-sdl.spec b/cdogs-sdl.spec index d7bd8fa..eb1b949 100644 --- a/cdogs-sdl.spec +++ b/cdogs-sdl.spec @@ -17,7 +17,7 @@ Name: cdogs-sdl -Version: 1.1.1 +Version: 1.2.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 @@ -25,6 +25,8 @@ 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 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 BuildRequires: cmake >= 3.12 BuildRequires: enet-devel BuildRequires: fdupes @@ -46,8 +48,7 @@ C-Dogs SDL is a classic overhead run-and-gun game, supporting up to from up to 11 weapons, and try over 100 user-created campaigns. Have fun! %prep -%setup -q -%patch0 -p1 +%autosetup -p1 # use system enet rm -rf src/cdogs/enet diff --git a/fix-source-file-directory.patch b/fix-source-file-directory.patch new file mode 100644 index 0000000..13dc084 --- /dev/null +++ b/fix-source-file-directory.patch @@ -0,0 +1,10 @@ +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 16:41:53.692774618 +0100 +@@ -10,5 +10,6 @@ + + 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) From 4317e250ac127afe6193287312af24ad1306853d3526bcb14e7e3a7ccc9729cd Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 3 Dec 2021 17:43:51 +0000 Subject: [PATCH 2/2] fix build OBS-URL: https://build.opensuse.org/package/show/games/cdogs-sdl?expand=0&rev=43 --- fix-source-file-directory.patch | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fix-source-file-directory.patch b/fix-source-file-directory.patch index 13dc084..182e379 100644 --- a/fix-source-file-directory.patch +++ b/fix-source-file-directory.patch @@ -1,7 +1,14 @@ 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 16:41:53.692774618 +0100 -@@ -10,5 +10,6 @@ ++++ 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}