From 8b97693ce63a2284055cf86111913c9ddea906f726613a0bf394bedf3e566a28 Mon Sep 17 00:00:00 2001
From: Dmitriy Perlow <dap.darkness@gmail.com>
Date: Thu, 5 Jul 2018 17:16:51 +0000
Subject: [PATCH] Accepting request 617406 from home:mnhauke

- Update to version 0.6.7
  * Add secondary weapon system (#33)
  * Add diagonal direction stickiness (#457)
  * Add option to remove blood (#544)
  * Fix unpausing not ignoring first key press (#548)
  * Fix compass arrows in shared camera view (#530)
  * Improve some sprites with semi-transparency
- Add patch:
  * cdogs-sdl-buildfix.patch

OBS-URL: https://build.opensuse.org/request/show/617406
OBS-URL: https://build.opensuse.org/package/show/games/cdogs-sdl?expand=0&rev=10
---
 cdogs-sdl-0.6.6.tar.gz   |  3 ---
 cdogs-sdl-0.6.7.tar.gz   |  3 +++
 cdogs-sdl-buildfix.patch | 13 +++++++++++++
 cdogs-sdl.changes        | 13 +++++++++++++
 cdogs-sdl.spec           | 16 +++++++++++-----
 5 files changed, 40 insertions(+), 8 deletions(-)
 delete mode 100644 cdogs-sdl-0.6.6.tar.gz
 create mode 100644 cdogs-sdl-0.6.7.tar.gz
 create mode 100644 cdogs-sdl-buildfix.patch

diff --git a/cdogs-sdl-0.6.6.tar.gz b/cdogs-sdl-0.6.6.tar.gz
deleted file mode 100644
index ee4b1fe..0000000
--- a/cdogs-sdl-0.6.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5552327ed7ca358acfbb20e9cf4d92443e70f624ca356c744724478cb7e9eb21
-size 20252238
diff --git a/cdogs-sdl-0.6.7.tar.gz b/cdogs-sdl-0.6.7.tar.gz
new file mode 100644
index 0000000..1d40e67
--- /dev/null
+++ b/cdogs-sdl-0.6.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af53c4f45938c4c57f630bc073ea84354ca5a6e26f4e315241a7ba9036c13b52
+size 10978992
diff --git a/cdogs-sdl-buildfix.patch b/cdogs-sdl-buildfix.patch
new file mode 100644
index 0000000..703eb8a
--- /dev/null
+++ b/cdogs-sdl-buildfix.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c114f63..46c010b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,7 +13,7 @@ SET(VERSION_MAJOR "0")
+ SET(VERSION_MINOR "6")
+ SET(VERSION_PATCH "7")
+ SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/appveyor.yml.cmake ${CMAKE_SOURCE_DIR}/appveyor.yml)
++#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/appveyor.yml.cmake ${CMAKE_SOURCE_DIR}/appveyor.yml)
+ # this must be 4 numbers
+ SET(VERSION_RC "${VERSION_MAJOR},${VERSION_MINOR},${VERSION_PATCH},0")
+ SET(WEBSITE "http://cxong.github.io/cdogs-sdl/")
diff --git a/cdogs-sdl.changes b/cdogs-sdl.changes
index f978888..67cc323 100644
--- a/cdogs-sdl.changes
+++ b/cdogs-sdl.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jun 18 07:11:36 UTC 2018 - mardnh@gmx.de
+
+- Update to version 0.6.7
+  * Add secondary weapon system (#33)
+  * Add diagonal direction stickiness (#457)
+  * Add option to remove blood (#544)
+  * Fix unpausing not ignoring first key press (#548)
+  * Fix compass arrows in shared camera view (#530)
+  * Improve some sprites with semi-transparency
+- Add patch:
+  * cdogs-sdl-buildfix.patch
+
 -------------------------------------------------------------------
 Thu Nov  2 15:20:50 UTC 2017 - mailaender@opensuse.org
 
diff --git a/cdogs-sdl.spec b/cdogs-sdl.spec
index 611cd13..ea78ec6 100644
--- a/cdogs-sdl.spec
+++ b/cdogs-sdl.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cdogs-sdl
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,19 @@
 
 
 Name:           cdogs-sdl
-Version:        0.6.6
+Version:        0.6.7
 Release:        0
 Summary:        Classic overhead run-and-gun game
-License:        GPL-2.0 and BSD-2-Clause and CC-BY-3.0 and CC-BY-SA-3.0
+License:        GPL-2.0-only AND BSD-2-Clause AND CC-BY-3.0 AND CC-BY-SA-3.0
 Group:          Amusements/Games/Action/Shoot
-Url:            http://cxong.github.io/cdogs-sdl
+URL:            http://cxong.github.io/cdogs-sdl
 Source:         https://github.com/cxong/cdogs-sdl/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:         cdogs-sdl-buildfix.patch
 BuildRequires:  cmake >= 2.8.2
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(SDL2_image)
 BuildRequires:  pkgconfig(SDL2_mixer)
@@ -42,6 +44,7 @@ from up to 11 weapons, and try over 100 user-created campaigns. Have fun!
 
 %prep
 %setup -q
+%patch0 -p1
 
 # use system enet
 rm -rf src/cdogs/enet
@@ -67,16 +70,19 @@ install -Dm0644 build/linux/cdogs-sdl.appdata.xml %{buildroot}%{_datadir}/appdat
 
 %fdupes %{buildroot}%{_datadir}
 
+%if 0%{?suse_version} < 1330
 %post
 %desktop_database_post
 %icon_theme_cache_post
+%endif
 
+%if 0%{?suse_version} < 1330
 %postun
 %desktop_database_postun
 %icon_theme_cache_postun
+%endif
 
 %files
-%defattr(-,root,root)
 %{_datadir}/applications/%{name}.desktop
 %{_bindir}/%{name}*
 %{_datadir}/%{name}/