diff --git a/warsow-paths.patch b/warsow-paths.patch index af07c94..5031a71 100644 --- a/warsow-paths.patch +++ b/warsow-paths.patch @@ -6,8 +6,8 @@ // - fs_cdpath = Cvar_Get( "fs_cdpath", "", CVAR_NOSET ); - fs_basepath = Cvar_Get( "fs_basepath", ".", CVAR_NOSET ); -+ fs_cdpath = Cvar_Get( "fs_cdpath", "__PREFIX__/share/warsow", CVAR_NOSET ); -+ fs_basepath = Cvar_Get( "fs_basepath", "__PREFIX__/lib/warsow", CVAR_NOSET ); ++ fs_cdpath = Cvar_Get( "fs_cdpath", "/usr/share/warsow", CVAR_NOSET ); ++ fs_basepath = Cvar_Get( "fs_basepath", "/usr/lib/warsow", CVAR_NOSET ); homedir = Sys_FS_GetHomeDirectory(); if( homedir != NULL ) #ifdef PUBLIC_BUILD diff --git a/warsow.appdata.xml b/warsow.appdata.xml index 283c5f6..dd0c3c7 100644 --- a/warsow.appdata.xml +++ b/warsow.appdata.xml @@ -12,9 +12,6 @@ GPL-2.0+ AND CC-BY-SA-4.0 AND CC-BY-ND-4.0 https://www.warsow.net/ pwalter@fedoraproject.org - - - https://www.warsow.net/images/y37fbax.jpg diff --git a/warsow.spec b/warsow.spec index b6b7a9b..e078e3a 100644 --- a/warsow.spec +++ b/warsow.spec @@ -1,22 +1,18 @@ -%global __cmake_in_source_build 1 -%global _legacy_common_support 1 -%global _cmake_generator "Unix Makefiles" %global warsow_libdir %{_prefix}/lib/warsow %global nodotver 21 Name: warsow Version: 2.1.2 -Release: 21%{?dist} +Release: 2%{?dist} Summary: Fast paced 3D first person shooter -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ URL: https://www.warsow.net/ Source0: http://update.warsow.gg/mirror/warsow_%{nodotver}_sdk.tar.gz Source1: warsow.desktop Source2: warsow.appdata.xml -# Downstream patch to look for data files and libs installed in our prefix +# Downstream patch to look for data files and libs installed in /usr Patch0: warsow-paths.patch # Downstream patch to use our optimization flags Patch1: warsow-build.patch @@ -24,7 +20,6 @@ Patch1: warsow-build.patch # Warsow is only ported to these architectures ExclusiveArch: %{ix86} x86_64 %{arm} -BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake @@ -40,11 +35,11 @@ BuildRequires: libXrandr-devel BuildRequires: libXxf86dga-devel BuildRequires: libXxf86vm-devel BuildRequires: mesa-libGL-devel -BuildRequires: openal-soft-devel +BuildRequires: openal-devel BuildRequires: openssl-devel BuildRequires: SDL2-devel BuildRequires: /usr/bin/appstream-util -BuildRequires: ImageMagick +BuildRequires: /usr/bin/convert BuildRequires: /usr/bin/desktop-file-validate BuildRequires: /usr/bin/dos2unix Requires: hicolor-icon-theme @@ -79,11 +74,8 @@ This package installs the standalone server and TV server for Warsow. %prep %setup -q -n warsow_%{nodotver}_sdk -%patch -P0 -p1 -b .paths -%patch -P1 -p1 -b .build - -# Replace the placeholder that patch0 added with the actual prefix -sed -i -e 's|__PREFIX__|%{_prefix}|g' source/source/qcommon/files.c +%patch0 -p1 -b .paths +%patch1 -p1 -b .build # Remove bundled libs pushd source/libsrcs @@ -101,9 +93,8 @@ pushd source/source/cmake_build %cmake \ -DQFUSION_GAME=Warsow \ -DUSE_SDL2=YES \ - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ .. -%cmake_build +make %{?_smp_mflags} popd @@ -133,6 +124,20 @@ install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/appdata/warsow.appdata. desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/warsow.desktop appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/warsow.appdata.xml + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %license docs/license.txt %{_bindir}/warsow @@ -147,65 +152,6 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/warsow. %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 2.1.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 2.1.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 2.1.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 2.1.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 2.1.2-17 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 2.1.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 2.1.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.1.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.1.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 2.1.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 2.1.2-8 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 2.1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jun 18 2019 Pete Walter - 2.1.2-4 -- Use correct prefix when building for flatpak -- Add release data - -* Sun Feb 03 2019 Fedora Release Engineering - 2.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Sat Jul 14 2018 Fedora Release Engineering - 2.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild