From 92a7130c7dffc6af75cdd94aa9e63cc60506e7b5626bccbdd955ef4c4d135f8c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 30 Aug 2020 12:49:04 +0000 Subject: [PATCH] Accepting request 830596 from home:mnhauke:games - Drop patch (fixed by upstream): * commandergenius-set-gskit-linker-language.patch - Update to release 2.5.5 * Improved controller configuration for multiplayer OBS-URL: https://build.opensuse.org/request/show/830596 OBS-URL: https://build.opensuse.org/package/show/games/commandergenius?expand=0&rev=22 --- Commander-Genius-v2.5.4.tar.bz2 | 3 --- Commander-Genius-v2.5.5.tar.bz2 | 3 +++ commandergenius-set-gskit-linker-language.patch | 12 ------------ commandergenius.changes | 12 ++++++++++++ commandergenius.spec | 7 +++---- 5 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 Commander-Genius-v2.5.4.tar.bz2 create mode 100644 Commander-Genius-v2.5.5.tar.bz2 delete mode 100644 commandergenius-set-gskit-linker-language.patch diff --git a/Commander-Genius-v2.5.4.tar.bz2 b/Commander-Genius-v2.5.4.tar.bz2 deleted file mode 100644 index ce0562a..0000000 --- a/Commander-Genius-v2.5.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:374b88b1c3ecbbbe2660dd13706add2043f5e34a02faeacee3893f737b4812f0 -size 55364736 diff --git a/Commander-Genius-v2.5.5.tar.bz2 b/Commander-Genius-v2.5.5.tar.bz2 new file mode 100644 index 0000000..5c3bdf9 --- /dev/null +++ b/Commander-Genius-v2.5.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f5ff2ef4dc2f64bb10c674dcdb6aa623a18404a30bad186403a92a27b262758 +size 55362049 diff --git a/commandergenius-set-gskit-linker-language.patch b/commandergenius-set-gskit-linker-language.patch deleted file mode 100644 index e38e674..0000000 --- a/commandergenius-set-gskit-linker-language.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/GsKit/CMakeLists.txt b/GsKit/CMakeLists.txt -index 9a5013a..0b8ebf1 100644 ---- a/GsKit/CMakeLists.txt -+++ b/GsKit/CMakeLists.txt -@@ -190,5 +190,7 @@ IF(USE_OPENGL) - target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES}) - ENDIF(USE_OPENGL) - -+SET_TARGET_PROPERTIES(GsKit PROPERTIES LINKER_LANGUAGE CXX) -+ - endif() - diff --git a/commandergenius.changes b/commandergenius.changes index 59d8f9e..40d183b 100644 --- a/commandergenius.changes +++ b/commandergenius.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Aug 30 12:03:13 UTC 2020 - Martin Hauke + +- Drop patch (fixed by upstream): + * commandergenius-set-gskit-linker-language.patch + +------------------------------------------------------------------- +Sun Aug 30 08:55:19 UTC 2020 - Martin Hauke + +- Update to release 2.5.5 + * Improved controller configuration for multiplayer + ------------------------------------------------------------------- Tue Aug 18 20:38:53 UTC 2020 - Martin Hauke diff --git a/commandergenius.spec b/commandergenius.spec index d80aa4b..5819a16 100644 --- a/commandergenius.spec +++ b/commandergenius.spec @@ -17,7 +17,7 @@ Name: commandergenius -Version: 2.5.4 +Version: 2.5.5 Release: 0 Summary: An open clone of the Commander Keen engines License: GPL-2.0-only @@ -25,7 +25,6 @@ Group: Amusements/Games/Action/Arcade URL: http://clonekeenplus.sf.net/ #Git-Clone: https://gitlab.com/Dringgstein/Commander-Genius.git Source: https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v%version/Commander-Genius-v%version.tar.bz2 -Patch0: commandergenius-set-gskit-linker-language.patch BuildRequires: boost-devel BuildRequires: cmake >= 2.8 BuildRequires: fdupes @@ -48,11 +47,11 @@ It has 4-player cooperative mode and six difficulty modes. %prep %setup -q -n Commander-Genius-v%version -%patch0 -p1 %build %cmake \ - -DCMAKE_SHARED_LINKER_FLAGS="" \ + -DBUILD_STATIC_LIBS:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX="%_prefix" \ -DAPPDIR="%_bindir" %make_jobs