diff --git a/.gitignore b/.gitignore index 03e77d9..be5a234 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /bzflag-2.4.14.tar.bz2 /bzflag-2.4.16.tar.bz2 /bzflag-2.4.18.tar.bz2 +/bzflag-2.4.22.tar.bz2 diff --git a/bzflag-2.0.12-findresolutions.patch b/bzflag-2.0.12-findresolutions.patch deleted file mode 100644 index 0d23d69..0000000 --- a/bzflag-2.0.12-findresolutions.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up bzflag-2.0.12/src/platform/BzfDisplay.cxx.findresolutions bzflag-2.0.12/src/platform/BzfDisplay.cxx ---- bzflag-2.0.12/src/platform/BzfDisplay.cxx.findresolutions 2008-04-06 07:30:37.000000000 +0200 -+++ bzflag-2.0.12/src/platform/BzfDisplay.cxx 2008-07-10 10:05:41.000000000 +0200 -@@ -137,9 +137,20 @@ bool BzfDisplay::doSetDefaultResolutio - - int BzfDisplay::findResolution(const char* name) const - { -- for (int i = 0; i < numResolutions; i++) -- if (strcmp(name, resolutions[i]->name) == 0) -+ for (int i = 0; i < numResolutions; i++) { -+ // only compare up to first space character -+ const char *cp1, *cp2; -+ int i1, i2; -+ -+ cp1 = strstr (name, " "); -+ cp2 = strstr (resolutions[i]->name, " "); -+ -+ i1 = cp1 ? (cp1 - name) : strlen (name); -+ i2 = cp2 ? (cp2 - resolutions[i]->name) : strlen (resolutions[i]->name); -+ -+ if ((i1 == i2) && (strncmp(name, resolutions[i]->name, i1 + 1) == 0)) - return i; -+ } - return -1; - } - diff --git a/bzflag.spec b/bzflag.spec index 7dbeed9..0f01de4 100644 --- a/bzflag.spec +++ b/bzflag.spec @@ -1,14 +1,13 @@ Summary: 3D multi-player tank battle game Name: bzflag -Version: 2.4.18 -Release: 11%{?dist} +Version: 2.4.22 +Release: 1%{?dist} License: LGPLv2 URL: http://bzflag.org Source0: https://download.bzflag.org/bzflag/source/%{version}/bzflag-%{version}.tar.bz2 Source1: bzflag.desktop Source2: bzflag.sysconfig Source3: bzflag.service -#Patch0: bzflag-2.0.12-findresolutions.patch BuildRequires: libXxf86vm-devel BuildRequires: libXext-devel BuildRequires: libSM-devel @@ -49,7 +48,6 @@ This package contains sample world maps for bzflag. %prep %setup -q -n %{name}-%{version} -#%patch0 -p1 -b .findresolutions %build # Use PIE because bzflag/bzfs are networked server applications @@ -160,6 +158,9 @@ exit 0 %{_datadir}/bzflag/maps/* %changelog +* Fri Mar 12 2021 Gwyn Ciesla - 2.4.22-1 +- 2.4.22 + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.4.18-11 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index 88c9cf5..68539b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bzflag-2.4.18.tar.bz2) = 8e3183f2d78b686c92f3b9911b3cad2fa0df5693401537dc674c75e192fd59451167b7ddc546aa8a090b38d7864b8f22459ba9a4702451987f9c1dfa87fdb246 +SHA512 (bzflag-2.4.22.tar.bz2) = c78ad0e9e861d0c922ef73dd1e040d998836efaab3a48d5a3cd8392835ce37392b1b9438aed7483ea48c6bce672bb937aeba40553553dce0c0fd3cce38bf10cf