The package rpms/naev.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/naev.git/commit/?id=791928b4ebfd3....
Change:
+ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
Thanks.
Full change:
============
commit 791928b4ebfd350efc7470989ae4e7e387655c93
Author: Jonathan Dieter <jdieter(a)gmail.com>
Date: Tue Dec 28 23:59:49 2021 +0000
Exclude s390x and ppc64le since LUAJIT doesn't build for them anymore
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
diff --git a/naev.spec b/naev.spec
index d13c341..e80e839 100644
--- a/naev.spec
+++ b/naev.spec
@@ -1,6 +1,6 @@
Name: naev
Version: 0.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: 2d action, RPG space game
License: GPLv3
URL:
http://naev.org
@@ -41,6 +41,8 @@ BuildRequires: gettext
Requires: %{name}-data = %{version}
+# LUAJIT isn't built for ppc64le and s390x anymore
+ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
%description
NAEV is a 2D space trading and combat game, in a similar vein to Escape
@@ -87,9 +89,10 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_metainfodir}/*.metainfo.xm
%changelog
-* Tue Dec 28 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.9.0-2
+* Tue Dec 28 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.9.0-3
- Update to 0.9.0
- Add missing build requirements
+- Exclude s390 and ppc64le since LUAJIT doesn't build on them anymore
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit 8caad16e68c0ba7a9b65ff836f6cda484c7a7d80
Author: Jonathan Dieter <jdieter(a)gmail.com>
Date: Tue Dec 28 23:50:14 2021 +0000
Add missing requirements
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
diff --git a/naev.spec b/naev.spec
index af2d837..d13c341 100644
--- a/naev.spec
+++ b/naev.spec
@@ -1,6 +1,6 @@
Name: naev
Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 2d action, RPG space game
License: GPLv3
URL:
http://naev.org
@@ -35,6 +35,9 @@ BuildRequires: lapack-devel
BuildRequires: metis-devel
BuildRequires: openblas-devel
BuildRequires: luajit-devel
+BuildRequires: python3-pyyaml
+BuildRequires: python3-mutagen
+BuildRequires: gettext
Requires: %{name}-data = %{version}
@@ -84,8 +87,9 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_metainfodir}/*.metainfo.xm
%changelog
-* Tue Dec 28 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.9.0-1
+* Tue Dec 28 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.9.0-2
- Update to 0.9.0
+- Add missing build requirements
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit 2f770d7546f9f7ec4f5f1b4b86f529a3f2d7c2b6
Author: Jonathan Dieter <jdieter(a)gmail.com>
Date: Tue Dec 28 23:27:25 2021 +0000
Update to 0.9.0
Signed-off-by: Jonathan Dieter <jdieter(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 0ee31a3..6004f9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/naev-0.6.1.tar.bz2
/naev-0.7.0.tar.bz2
/naev-nodata-0.8.2.tar.gz
+/naev-nodata-0.9.0.tar.zst
diff --git a/naev-nodata.sh b/naev-nodata.sh
new file mode 100755
index 0000000..7e01a95
--- /dev/null
+++ b/naev-nodata.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+set -x
+
+tar -xvf naev-$1-source.tar.*
+cd naev-$1
+# Clear artwork except licenses
+mv artwork/gfx/ARTWORK_LICENSE.yaml ./
+mv artwork/snd/SOUND_LICENSE.yaml ./
+rm artwork -rf
+mkdir -p artwork/gfx
+mkdir -p artwork/snd
+mv ARTWORK_LICENSE.yaml artwork/gfx
+mv SOUND_LICENSE.yaml artwork/snd
+# Clear third party sources that aren't required to build in Fedora
+rm -rf subprojects/packagefiles
+cd ..
+mv naev-$1 naev-nodata-$1
+tar -I 'zstd -15' -cvf naev-nodata-$1.tar.zst naev-nodata-$1
diff --git a/naev.spec b/naev.spec
index 5d992f7..af2d837 100644
--- a/naev.spec
+++ b/naev.spec
@@ -1,18 +1,15 @@
Name: naev
-Version: 0.8.2
-Release: 2%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
Summary: 2d action, RPG space game
License: GPLv3
URL:
http://naev.org
# To build source without massive data files:
-# Download
https://github.com/naev/naev/archive/v<version>/naev-<version>...
+# Download
https://github.com/naev/naev/archive/v<version>/naev-<version>...
# Run:
-# $ tar -xvf naev-<version>.tar.gz
-# $ rm -rf naev-<version>/dat
-# $ mkdir naev-<version>/dat
-# $ mv naev-<version> naev-nodata-<version>
-# $ tar -czvf naev-nodata-<version>.tar.gz naev-nodata-<version>
-Source: %{name}-nodata-%{version}.tar.gz
+# $ ./naev-nodata.sh <version>
+Source0: %{name}-nodata-%{version}.tar.zst
+Source1: naev-nodata.sh
BuildRequires: meson
BuildRequires: gcc
BuildRequires: SDL2-devel
@@ -24,13 +21,21 @@ BuildRequires: libvorbis-devel
BuildRequires: openal-soft-devel
BuildRequires: desktop-file-utils
BuildRequires: SDL2_mixer-devel
-BuildRequires: compat-lua-devel
BuildRequires: readline-devel
BuildRequires: suitesparse-devel
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: libzip-devel
BuildRequires: libappstream-glib
+BuildRequires: libunibreak-devel
+BuildRequires: physfs-devel
+BuildRequires: libwebp-devel
+BuildRequires: glpk-devel
+BuildRequires: lapack-devel
+BuildRequires: metis-devel
+BuildRequires: openblas-devel
+BuildRequires: luajit-devel
+
Requires: %{name}-data = %{version}
@@ -42,18 +47,19 @@ NAEV is played from a top-down perspective, featuring fast-paced
combat, many
ships, a large variety of equipment and a large galaxy to explore. The game is
highly open-ended, letting you proceed at your own pace.
+
%prep
%autosetup -n %{name}-nodata-%{version}
-# Remove built-in libraries
-rm -rf lib/lua lib/csparse
+# Remove third part libraries so we're guaranteed to use system libraries
+rm -rf subprojects/packagefiles
# Patch meson.build for Fedora compat-lua
sed -i 's/lua51/lua-5.1/g' meson.build
+
%build
-# Disabling luajit since the version in Fedora causes Naev to crash
# Disabling C and LUA docs since those are only required if you're hacking on Naev
-%meson -Dluajit=disabled -Ddocs_c=disabled -Ddocs_lua=disabled
+%meson -Ddocs_c=disabled -Ddocs_lua=disabled
%meson_build
%install
@@ -64,8 +70,9 @@ sed -i '/<icon/d'
%{buildroot}/%{_metainfodir}/*.metainfo.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/org.naev.naev.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml
+
%files
-%doc README
+%doc Readme.md
%license LICENSE
%{_bindir}/%{name}
%{_datadir}/applications/*.desktop
@@ -75,13 +82,16 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_metainfodir}/*.metainfo.xm
%{_mandir}/man6/*
%{_docdir}/naev
+
%changelog
+* Tue Dec 28 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.9.0-1
+- Update to 0.9.0
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sat Feb 27 2021 Jonathan Dieter <jdieter(a)gmail.com> - 0.8.2-1
- Update to 0.8.2
-- Obsolete naev-data since data is now part of the source
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-13
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index d6894fb..b7fcc30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (naev-nodata-0.8.2.tar.gz) =
1f1d1fe0a8bc107aefb297f905fc3597c268c39ffc4b8fa3f9541fb0969d618c00c340c1e7783cc3226fd7d0684224f5e32cd493ce217172d1ca99d474c33b3f
+SHA512 (naev-nodata-0.9.0.tar.zst) =
5b7a1622779fa4c6a7faedc8c0cd3b38ad35e569fea5d94c88dec60fb9a306166f7442596252b01081e7ba26657eaa3c7caffe9b61c0befb40fcb2d82aa4d9b9