From bd85522faad3ef3fb1390650da7eccb3cd523621 Mon Sep 17 00:00:00 2001 From: aaronpuchert <> Date: Sep 28 2022 16:01:32 +0000 Subject: Update 0ad to version 0.0.26 / rev 8 via SR 1006542 https://build.opensuse.org/request/show/1006542 by user aaronpuchert + RBrownFactory - Update to 0.0.26 - Remove obsolete glibc-2.35.patch. --- diff --git a/.files b/.files index b302f93..fe36a6c 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 4014641..08972c5 100644 --- a/.rev +++ b/.rev @@ -58,4 +58,14 @@ 994558 + + ad7df2a95684015ed2a2f696bb8fa52c + 0.0.26 + + RBrownFactory + - Update to 0.0.26 +- Remove obsolete glibc-2.35.patch. + + 1006542 + diff --git a/0ad-0.0.25b-alpha-unix-build.tar.xz b/0ad-0.0.25b-alpha-unix-build.tar.xz deleted file mode 120000 index 272cc94..0000000 --- a/0ad-0.0.25b-alpha-unix-build.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiez3gk74xh7arxialdjlb4naqw3hw34xgt5jjzyerxrpw3i7murae \ No newline at end of file diff --git a/0ad-0.0.26-alpha-unix-build.tar.xz b/0ad-0.0.26-alpha-unix-build.tar.xz new file mode 120000 index 0000000..62deb16 --- /dev/null +++ b/0ad-0.0.26-alpha-unix-build.tar.xz @@ -0,0 +1 @@ +/ipfs/bafybeic2f3l5nmdocrrdoi34qqed4z23iskgquyc536az3qmgd44p3l2ua \ No newline at end of file diff --git a/0ad.changes b/0ad.changes index 554481d..ce2d46f 100644 --- a/0ad.changes +++ b/0ad.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 26 21:28:24 UTC 2022 - C J + +- Update to 0.0.26 +- Remove obsolete glibc-2.35.patch. + +------------------------------------------------------------------- Wed Aug 10 21:06:44 UTC 2022 - Aaron Puchert - Fix rpmlint by adding premake-no-automatic-rpath.patch: don't let diff --git a/0ad.spec b/0ad.spec index 79d32a9..3d26256 100644 --- a/0ad.spec +++ b/0ad.spec @@ -31,7 +31,7 @@ # Use provided library %bcond_without system_nvtt Name: 0ad -Version: 0.0.25b +Version: 0.0.26 Release: 0 Summary: A real-time strategy game of ancient warfare License: BSD-3-Clause AND CC-BY-SA-3.0 AND GPL-2.0-or-later AND LGPL-3.0-or-later AND MIT AND ISC AND MPL-2.0 @@ -44,10 +44,8 @@ Patch0: avoid_duplicate_global_symbol_from_asm.patch Patch1: no-version-check.patch # PATCH-FIX-OPENSUSE -- Use the newer variant of this function (related to mozjs78 upgrade) Patch2: PrepareZoneForGC.patch -# PATCH-FIX-UPSTREAM -- Don't define M_PIf if glibc already provides it -Patch3: glibc-2.35.patch # PATCH-FIX-OPENSUSE -- Skip automatic addition of an RPATH. -Patch4: premake-no-automatic-rpath.patch +Patch3: premake-no-automatic-rpath.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libXcursor-devel @@ -99,7 +97,6 @@ flexible game engine. %setup -q -n %{name}-%{version}-alpha %patch0 -p1 %patch3 -p1 -%patch4 -p1 %if %{with system_mozjs} %patch1 -p1 %patch2 -p1 diff --git a/glibc-2.35.patch b/glibc-2.35.patch deleted file mode 100644 index 6d5b101..0000000 --- a/glibc-2.35.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp -index d4796ec..d0e8c9a 100644 ---- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp -+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Environment/Environment.cpp -@@ -29,7 +29,9 @@ using AtlasMessage::Shareable; - - static Observable g_EnvironmentSettings; - -+#ifndef M_PIf - const float M_PIf = 3.14159265f; -+#endif - - //////////////////////////////////////////////////////////////////////////