Accepting request 758849 from games

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

cdogs-sdl-0.7.1.tar.gz

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

cdogs-sdl-0.7.2.tar.gz

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

cdogs-sdl-fix-desktop-and-appdata.patch

@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c58e5c5..6a24b7d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -255,12 +255,12 @@ INSTALL(FILES
+ 	${CMAKE_SOURCE_DIR}/README.md
+ 	DESTINATION ${DATA_INSTALL_DIR})
+ IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/build/linux/io.github.cxong.cdogs-sdl.desktop DESTINATION ${INSTALL_PREFIX}/share/applications)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/build/linux/io.github.cxong.cdogs-sdl.appdata.xml DESTINATION ${INSTALL_PREFIX}/share/appdata)
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/build/linux/io.github.cxong.cdogs-sdl.desktop DESTINATION ${INSTALL_PREFIX}/share/applications/ RENAME cdogs-sdl.desktop)
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/build/linux/io.github.cxong.cdogs-sdl.appdata.xml DESTINATION ${INSTALL_PREFIX}/share/appdata/ RENAME cdogs-sdl.appdata.xml)
+ 	foreach(RES 16 22 32 48 128)
+ 		INSTALL(FILES ${CMAKE_SOURCE_DIR}/build/linux/cdogs-icon.${RES}.png
+ 			DESTINATION ${INSTALL_PREFIX}/share/icons/hicolor/${RES}x${RES}/apps
+-			RENAME io.github.cxong.cdogs-sdl.png)
++			RENAME cdogs-sdl.png)
+ 	endforeach(RES)
+ elseif(WIN32)
+ 	# Package for Windows
+diff --git a/build/linux/io.github.cxong.cdogs-sdl.desktop.cmake b/build/linux/io.github.cxong.cdogs-sdl.desktop.cmake
+index 3d40fbf..567315f 100644
+--- a/build/linux/io.github.cxong.cdogs-sdl.desktop.cmake
++++ b/build/linux/io.github.cxong.cdogs-sdl.desktop.cmake
+@@ -1,7 +1,6 @@
+ [Desktop Entry]
+ Name=C-Dogs SDL
+ GenericName=Action/Arcade Game
+-Version=@VERSION@
+ Type=Application
+ Categories=Game;ActionGame;
+ Keywords=Game;Arcade;Shooter;Retro;
+@@ -9,4 +8,4 @@ Comment=Classic overhead run-and-gun game
+ TryExec=cdogs-sdl
+ Exec=cdogs-sdl
+ Terminal=false
+-Icon=io.github.cxong.cdogs-sdl
++Icon=cdogs-sdl

cdogs-sdl.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Dec 21 14:50:59 UTC 2019 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 0.7.2
+  Fix editor
+  * Remove broken second window option
+  * Fix editor
+  * Fix mission end scores infinite incrementing
+  * Fix bullet hole rendering on doors
+  * Add fullscreen switching via Alt+Enter shortcut
+- Add patch:
+  * cdogs-sdl-fix-desktop-and-appdata.patch
+
 -------------------------------------------------------------------
 Sat Nov 23 19:31:59 UTC 2019 - Martin Hauke <mardnh@gmx.de>
 

cdogs-sdl.spec

@@ -17,13 +17,14 @@
 
 
 Name:           cdogs-sdl
-Version:        0.7.1
+Version:        0.7.2
 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
 Group:          Amusements/Games/Action/Shoot
 URL:            http://cxong.github.io/cdogs-sdl
 Source:         https://github.com/cxong/cdogs-sdl/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:         cdogs-sdl-fix-desktop-and-appdata.patch
 BuildRequires:  cmake >= 2.8.2
 BuildRequires:  dos2unix
 BuildRequires:  enet-devel
@@ -43,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
@@ -58,14 +60,6 @@ make %{?_smp_mflags}
 
 %install
 %cmake_install
-
-install -Dm0644 build/linux/cdogs-icon.16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/cdogs-sdl.png
-install -Dm0644 build/linux/cdogs-icon.22.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/cdogs-sdl.png
-install -Dm0644 build/linux/cdogs-icon.32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/cdogs-sdl.png
-install -Dm0644 build/linux/cdogs-icon.48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/cdogs-sdl.png
-
-install -Dm0644 build/linux/cdogs-sdl.appdata.xml %{buildroot}%{_datadir}/appdata/cdogs-sdl.appdata.xml
-
 %fdupes %{buildroot}%{_datadir}
 
 %if 0%{?suse_version} < 1330