diff --git a/cdogs-gLog.patch b/cdogs-gLog.patch deleted file mode 100644 index 25a1c0b..0000000 --- a/cdogs-gLog.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur cdogs-sdl-0.9.0/src/cdogs/log.c new/src/cdogs/log.c ---- cdogs-sdl-0.9.0/src/cdogs/log.c 2020-09-16 15:27:30.000000000 +0200 -+++ new/src/cdogs/log.c 2020-09-30 13:06:55.179642290 +0200 -@@ -32,6 +32,7 @@ - #include "rlutil/rlutil.h" - #include "utils.h" - -+FILE *gLogFile; - - typedef struct - { -diff -Nur cdogs-sdl-0.9.0/src/cdogs/log.h new/src/cdogs/log.h ---- cdogs-sdl-0.9.0/src/cdogs/log.h 2020-09-16 15:27:30.000000000 +0200 -+++ new/src/cdogs/log.h 2020-09-30 13:06:34.435491593 +0200 -@@ -60,7 +60,7 @@ - const char *LogLevelName(const LogLevel l); - LogLevel StrLogLevel(const char *s); - --FILE *gLogFile; -+extern FILE *gLogFile; - void LogInit(void); - void LogOpenFile(const char *filename); - void LogTerminate(void); diff --git a/cdogs-sdl-0.9.0.tar.gz b/cdogs-sdl-0.9.0.tar.gz deleted file mode 100644 index fab6435..0000000 --- a/cdogs-sdl-0.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db1fc06f3a7ee49a5ed1505faeb7d3c8fd11d385dcb6c1042870e524839737bc -size 23541673 diff --git a/cdogs-sdl-0.9.1.tar.gz b/cdogs-sdl-0.9.1.tar.gz new file mode 100644 index 0000000..bf26721 --- /dev/null +++ b/cdogs-sdl-0.9.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fee87e90371e6c8f679e75a3628d82b863a67250bd822c672a4017f6a078eb56 +size 23552051 diff --git a/cdogs-sdl.changes b/cdogs-sdl.changes index e46660a..95d0d8e 100644 --- a/cdogs-sdl.changes +++ b/cdogs-sdl.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Oct 1 18:35:10 UTC 2020 - Martin Hauke + +- Update to 0.9.1: + * Fix bugs that spawn player in locked rooms + Game + * Fix spawning player in locked rooms. + * Fix spawning keys inside locked doors. + * Add show map powerup in Doom campaign. + Editor + * Add color highlights for locked rooms. + Other + * Fix linker issue in gcc10 (fixed by @susnux). +- Drop patch: + * cdogs-gLog.patch (fixed upstream) + ------------------------------------------------------------------- Wed Sep 30 11:12:45 UTC 2020 - Ferdinand Thiessen diff --git a/cdogs-sdl.spec b/cdogs-sdl.spec index e63ecfc..faad904 100644 --- a/cdogs-sdl.spec +++ b/cdogs-sdl.spec @@ -17,7 +17,7 @@ Name: cdogs-sdl -Version: 0.9.0 +Version: 0.9.1 Release: 0 Summary: Classic overhead run-and-gun game License: GPL-2.0-only AND BSD-2-Clause AND CC-BY-3.0 AND CC-BY-SA-3.0 @@ -28,8 +28,6 @@ Source: https://github.com/cxong/cdogs-sdl/archive/%{version}/%{name}-%{ Patch0: cdogs-sdl-fix-desktop-and-appdata.patch # PATCH-FIX-UPSTREAM nanopb.patch -- https://github.com/nanopb/nanopb/issues/521 Patch1: nanopb.patch -# PATCH-FIX-UPSTREAM cdogs-gLog.patch -- https://github.com/cxong/cdogs-sdl/issues/658 -Patch2: cdogs-gLog.patch BuildRequires: cmake >= 3.12 BuildRequires: dos2unix BuildRequires: enet-devel @@ -55,7 +53,6 @@ from up to 11 weapons, and try over 100 user-created campaigns. Have fun! %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 sed -i 's|env python|python3|' src/proto/nanopb/generator/{protoc,nanopb_generator.py}