The package rpms/pioneer.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pioneer.git/commit/?id=7b3edd825d....
Change:
-%ifarch %{ix86}
Thanks.
Full change:
============
commit 7b3edd825d781d881ff2e0604cc66f51858a7fe8
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Tue Dec 22 21:03:29 2020 +0100
Release 20201222-rc1
diff --git a/.gitignore b/.gitignore
index 5ec3c69..d205166 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/pioneer-20191009.tar.gz
/pioneer-20191117.tar.gz
/pioneer-20200203.tar.gz
+/pioneer-20201222-rc1.tar.gz
diff --git a/pioneer-bug4691.patch b/pioneer-bug4691.patch
deleted file mode 100644
index 1c7c8c7..0000000
--- a/pioneer-bug4691.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/scenegraph/Serializer.orig.h 2019-10-09 13:49:04.000000000 +0200
-+++ b/src/scenegraph/Serializer.h 2019-10-09 18:47:05.238671730 +0200
-@@ -23,14 +23,14 @@
- // where possible, prefer serializing state information via JSON instead.
- namespace Serializer {
- static_assert((sizeof(Uint32) == 4 && alignof(Uint32) == 4), "Int32 is
sized differently on this platform and will not serialize properly.");
-- static_assert((sizeof(Uint64) == 8 && alignof(Uint64) == 8), "Int64 is
sized differently on this platform and will not serialize properly.");
-+ static_assert((sizeof(Uint64) == 8 && alignof(Uint64) <= 8), "Int64 is
sized differently on this platform and will not serialize properly.");
- static_assert((sizeof(Color) == 4 && alignof(Color) == 1), "Color is
padded differently on this platform and will not serialize properly.");
- static_assert((sizeof(vector2f) == 8 && alignof(vector2f) == 4), "Vector2f
is padded differently on this platform and will not serialize properly.");
-- static_assert((sizeof(vector2d) == 16 && alignof(vector2d) == 8),
"Vector2d is padded differently on this platform and will not serialize
properly.");
-+ static_assert((sizeof(vector2d) == 16 && alignof(vector2d) <= 8),
"Vector2d is padded differently on this platform and will not serialize
properly.");
- static_assert((sizeof(vector3f) == 12 && alignof(vector3f) == 4),
"Vector3f is padded differently on this platform and will not serialize
properly.");
-- static_assert((sizeof(vector3d) == 24 && alignof(vector3d) == 8),
"Vector3d is padded differently on this platform and will not serialize
properly.");
-+ static_assert((sizeof(vector3d) == 24 && alignof(vector3d) <= 8),
"Vector3d is padded differently on this platform and will not serialize
properly.");
- static_assert((sizeof(Quaternionf) == 16 && alignof(Quaternionf) == 4),
"Quaternionf is padded differently on this platform and will not serialize
properly.");
-- static_assert((sizeof(Aabb) == 56 && alignof(Aabb) == 8), "Aabb is padded
differently on this platform and will not serialize properly.");
-+ static_assert((sizeof(Aabb) == 56 && alignof(Aabb) <= 8), "Aabb is
padded differently on this platform and will not serialize properly.");
-
- class Writer {
- public:
diff --git a/pioneer.spec b/pioneer.spec
index bdcea0c..bdb2f12 100644
--- a/pioneer.spec
+++ b/pioneer.spec
@@ -1,8 +1,6 @@
#
https://github.com/pioneerspacesim/pioneer/issues/3846
ExclusiveArch: %{ix86} x86_64
-%global __cmake_in_source_build 1
-
%global use_autotools 0
%global use_intermediate 0
@@ -25,18 +23,17 @@ ExclusiveArch: %{ix86} x86_64
Name: pioneer
Summary: A game of lonely space adventure
-Version: 20200203
-Release: 4%{date}%{shortcommit}%{?dist}
+Version: 20201222
+Release: 0.1.rc1%{date}%{shortcommit}%{?dist}
## Main license: GPLv3
## Dejavu font license: Bitstream Vera and Public Domain
## Pioneer's art, music and other assets (including Lua model scripts): CC-BY-SA
License: GPLv3 and CC-BY-SA and Bitstream Vera and Public Domain
URL:
http://pioneerspacesim.net/
-Source0:
https://github.com/pioneerspacesim/%{name}/archive/%{version}/%{name}-%{v...
+Source0:
https://github.com/pioneerspacesim/%{name}/archive/%{version}-rc1/%{name}...
Source1: %{name}.desktop
Source2: %{name}.appdata.xml
-Patch0: %{name}-bug4691.patch
%if 0%{?use_autotools}
BuildRequires: autoconf
@@ -129,10 +126,7 @@ Requires: fontpackages-filesystem
PionilliumText22L Medium font file based on Titillium.
%prep
-%autosetup -n %{name}-%{version} -N
-%ifarch %{ix86}
-%autopatch -p1
-%endif
+%autosetup -n %{name}-%{version}-rc1
## Pioneer does not work with Lua 5.3.*
## We cannot unbundle internal Lua yet
@@ -153,12 +147,11 @@ PionilliumText22L Medium font file based on Titillium.
PIONEER_DATA_DIR=%{_datadir}/%{name}
%make_build V=1 OPTIMISE=""
%else
-mkdir -p build && pushd build
-%cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
+mkdir -p build
+%cmake -S build -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
-DUSE_SYSTEM_LIBLUA:BOOL=OFF -DUSE_SYSTEM_LIBGLEW:BOOL=ON \
- -DPIONEER_DATA_DIR:PATH=%{_datadir}/%{name} ..
-%make_build V=1
-popd
+ -DPIONEER_DATA_DIR:PATH=%{_datadir}/%{name}
+%cmake_build
%endif
## Build documentation
@@ -170,7 +163,7 @@ doxygen
%if 0%{?use_autotools}
%make_install
%else
-%make_install -C build
+%cmake_install
%endif
## Remove rpaths
@@ -286,6 +279,9 @@ ln -sf $(fc-match -f "%{file}" "dejavusans")
%{buildroot}%{_datadir}/%{name}/fon
%dir %{_fontdir}
%changelog
+* Tue Dec 22 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 20201222-0.1.rc1
+- Release 20201222-rc1
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
20200203-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
- Enable cmake_in_source_build
diff --git a/sources b/sources
index 9498009..0e278e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pioneer-20200203.tar.gz) =
0e4a0dc968ecdf065dccd747215d97da371c80b58639aaf10b08ae8200c4bd2e7c929fcadcbefa6a27aa91432c03e4ca1ed87c6dd9b4edd0010b194a736c53bb
+SHA512 (pioneer-20201222-rc1.tar.gz) =
bf575b9a27bb26e93ce3acf66b2b5ba4ed1a834af947b3df99e3798fb734cfdf164347df5e302e5f2b760c7addf4eb91c05d9b3bcf1d2847626ce87956a158ea