rpm/cdogs-sdl
SHA256
1
0
Fork 0
forked from pool/cdogs-sdl
Code Pull Requests Activity

Accepting request 860557 from games

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/860557
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cdogs-sdl?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2021-01-07 20:22:13 +00:00 committed by Git OBS Bridge
commit 34254bee90
6 changed files with 29 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cdogs-sdl-0.10.1.tar.gz
View File

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

3
cdogs-sdl-0.10.2.tar.gz Normal file
View File

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

30
cdogs-sdl-fix-desktop-and-appdata.patch
View File

@ -1,30 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e506aaa..9c14ce4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,12 +227,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/metainfo)
+ 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/metainfo 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 b/build/linux/io.github.cxong.cdogs-sdl.desktop
index ab648a9..bb3464b 100644
--- a/build/linux/io.github.cxong.cdogs-sdl.desktop
+++ b/build/linux/io.github.cxong.cdogs-sdl.desktop
@@ -9,4 +9,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

19
cdogs-sdl.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Jan 5 23:57:23 UTC 2021 - Martin Hauke <mardnh@gmx.de>
- Update to 0.10.2:
* Fix loading classic campaigns
* Fix PVP rounds not ending
* Fix missing mouse cursor and trail
* Fix linux build
* Fix dogfight scores not updated properly
* Add peaked cap hat
* Add soldier body type
* Improve weapon equip menu, show available weapons, allow gun
swapping.
* Improve game startup by skipping mission briefing if it is empty
- Drop not longer neede patches
* cdogs-sdl-fix-desktop-and-appdata.patch
* nanopb.patch
- Package license file and readme
-------------------------------------------------------------------
Tue Dec 1 07:46:07 UTC 2020 - Martin Hauke <mardnh@gmx.de>

27
cdogs-sdl.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package cdogs-sdl
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,19 +17,14 @@
Name: cdogs-sdl
Version: 0.10.1
Version: 0.10.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: https://cxong.github.io/cdogs-sdl
Source: https://github.com/cxong/cdogs-sdl/archive/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE cdogs-sdl-fix-desktop-and-appdata.patch mardnh@gmx.de -- Fix desktop/appdata filenames.
Patch0: cdogs-sdl-fix-desktop-and-appdata.patch
# PATCH-FIX-UPSTREAM nanopb.patch -- https://github.com/nanopb/nanopb/issues/521
Patch1: nanopb.patch
BuildRequires: cmake >= 3.12
BuildRequires: dos2unix
BuildRequires: enet-devel
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
@ -51,19 +46,9 @@ from up to 11 weapons, and try over 100 user-created campaigns. Have fun!
%prep
%setup -q
%patch0 -p1
%patch1 -p1
sed -i 's|env python|python3|' src/proto/nanopb/generator/{protoc,nanopb_generator.py}
# use system enet
rm -rf src/cdogs/enet
#dos2unix doc/original_readme.txt
# disable -Werror (aborts build on mere warnings)
#sed 's| -Werror||' -i CMakeLists.txt
%build
%cmake -DCDOGS_DATA_DIR=%{_datadir}/%{name}/ -DUSE_SHARED_ENET=ON
%cmake_build
@ -73,10 +58,12 @@ rm -rf src/cdogs/enet
%fdupes %{buildroot}%{_datadir}
%files
%{_datadir}/applications/%{name}.desktop
%license COPYING
%doc README.md
%{_datadir}/applications/*.desktop
%{_bindir}/%{name}*
%{_datadir}/%{name}/
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/metainfo/%{name}.appdata.xml
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/metainfo/*.appdata.xml
%changelog

12
nanopb.patch
View File

@ -1,12 +0,0 @@
diff -Nur cdogs-sdl-0.9.0/src/proto/nanopb/generator/nanopb_generator.py new/src/proto/nanopb/generator/nanopb_generator.py
--- cdogs-sdl-0.9.0/src/proto/nanopb/generator/nanopb_generator.py 2020-09-16 15:27:30.000000000 +0200
+++ new/src/proto/nanopb/generator/nanopb_generator.py 2020-09-30 12:35:40.026179442 +0200
@@ -1928,7 +1928,7 @@
for fdesc in fdescs.values():
results = process_file(fdesc.name, fdesc, options, other_files)
- base_dir = options.output_dir or ''
+ base_dir = options.output_dir or '.'
to_write = [
(os.path.join(base_dir, results['headername']), results['headerdata']),
(os.path.join(base_dir, results['sourcename']), results['sourcedata']),