Accepting request 838761 from home:susnux:branches:games

Fix tumbleweed build and update

OBS-URL: https://build.opensuse.org/request/show/838761
OBS-URL: https://build.opensuse.org/package/show/games/cdogs-sdl?expand=0&rev=21

cdogs-sdl.spec

@@ -17,26 +17,33 @@
 
 
 Name:           cdogs-sdl
-Version:        0.8.0
+Version:        0.9.0
 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
+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
+# 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
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig
+BuildRequires:  python3-protobuf
+BuildRequires:  python3-setuptools
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(SDL2_image)
 BuildRequires:  pkgconfig(SDL2_mixer)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(physfs)
+BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(sdl2)
 
 %description
@@ -47,41 +54,32 @@ from up to 11 weapons, and try over 100 user-created campaigns. Have fun!
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -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
+#dos2unix doc/original_readme.txt
 
 # disable -Werror (aborts build on mere warnings)
-sed 's| -Werror||' -i CMakeLists.txt
+#sed 's| -Werror||' -i CMakeLists.txt
 
 %build
 %cmake -DCDOGS_DATA_DIR=%{_datadir}/%{name}/ -DUSE_SHARED_ENET=ON
-make %{?_smp_mflags}
+%cmake_build
 
 %install
 %cmake_install
 %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
 %{_datadir}/applications/%{name}.desktop
 %{_bindir}/%{name}*
 %{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
-%dir %{_datadir}/appdata/
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/metainfo/%{name}.appdata.xml
 
 %changelog