The package rpms/0ad.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/0ad.git/commit/?id=8736d54e97d6e8....
Change:
+%ifnarch aarch64
Thanks.
Full change:
============
commit 8736d54e97d6e8e79c9024986e35c8fe12ee0dde
Author: Kalev Lember <klember(a)redhat.com>
Date: Wed Feb 6 16:35:13 2019 +0100
Validate the appdata file
While at this, move the %check section to the canonical location after
%install.
diff --git a/0ad.spec b/0ad.spec
index 5b1ef32..0e09962 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -96,6 +96,7 @@ BuildRequires: SDL2-devel
BuildRequires: subversion
BuildRequires: valgrind-devel
BuildRequires: wxGTK3-devel
+BuildRequires: /usr/bin/appstream-util
BuildRequires: /usr/bin/python
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
@@ -160,15 +161,6 @@ build/workspaces/update-workspaces.sh \
make %{?_smp_mflags} -C build/workspaces/gcc config=%{config} verbose=1
#-----------------------------------------------------------------------
-# Depends on availablity of nvtt
-%ifnarch aarch64
-%if %{with nvtt}
-%check
-LD_LIBRARY_PATH=binaries/system binaries/system/test%{dbg} -libdir binaries/system
-%endif
-%endif
-
-#-----------------------------------------------------------------------
%install
install -d -m 755 %{buildroot}%{_bindir}
install -p -m 755 build/resources/0ad.sh %{buildroot}%{_bindir}/0ad
@@ -201,13 +193,23 @@ install -d -m 755 %{buildroot}%{_mandir}/man6
install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man6/%{name}.6
ln -sf %{name}.6 %{buildroot}%{_mandir}/man6/pyrogenesis.6
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-
%if %{with debug}
export STRIP=/bin/true
%endif
#-----------------------------------------------------------------------
+%check
+# Depends on availablity of nvtt
+%ifnarch aarch64
+%if %{with nvtt}
+LD_LIBRARY_PATH=binaries/system binaries/system/test%{dbg} -libdir binaries/system
+%endif
+%endif
+
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/0ad.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/0ad.desktop
+
+#-----------------------------------------------------------------------
%files
%doc README.txt
%license LICENSE.txt
@@ -226,6 +228,7 @@ export STRIP=/bin/true
- Correctly set RPATH for private libraries
- Install the icon to the hicolor icon theme
- Move the appdata file to metainfo directory
+- Validate the appdata file
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.0.23b-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit a42cc39f8586555ec86e1cb15233bc99b46e956e
Author: Kalev Lember <klember(a)redhat.com>
Date: Wed Feb 6 16:33:17 2019 +0100
Install the icon to the hicolor icon theme
- Move the appdata file to metainfo directory
diff --git a/0ad.spec b/0ad.spec
index 2afb149..5b1ef32 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -65,6 +65,8 @@ Source1: %{name}-licensecheck.txt
Source2: %{name}.6
Requires: %{name}-data = %{version}
+Requires: hicolor-icon-theme
+
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -183,14 +185,14 @@ for name in nvcore nvimage nvmath nvtt; do
done
%endif
-install -d -m 755 %{buildroot}%{_datadir}/appdata
-install -p -m 644 build/resources/0ad.appdata.xml %{buildroot}%{_datadir}/appdata
+install -d -m 755 %{buildroot}%{_datadir}/metainfo
+install -p -m 644 build/resources/0ad.appdata.xml
%{buildroot}%{_datadir}/metainfo/0ad.appdata.xml
install -d -m 755 %{buildroot}%{_datadir}/applications
-install -p -m 644 build/resources/0ad.desktop
%{buildroot}%{_datadir}/applications/%{name}.desktop
+install -p -m 644 build/resources/0ad.desktop
%{buildroot}%{_datadir}/applications/0ad.desktop
-install -d -m 755 %{buildroot}%{_datadir}/pixmaps
-install -p -m 644 build/resources/0ad.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
+install -p -m 644 build/resources/0ad.png
%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/0ad.png
install -d -m 755 %{buildroot}%{_datadir}/%{name}
cp -a binaries/data/* %{buildroot}%{_datadir}/%{name}
@@ -212,16 +214,18 @@ export STRIP=/bin/true
%license license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt
%{_bindir}/0ad
%{_bindir}/pyrogenesis%{dbg}
-%{_libdir}/%{name}
-%{_datadir}/pixmaps/%{name}.png
-%{_datadir}/appdata/0ad.appdata.xml
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/%{name}
+%{_libdir}/0ad/
+%{_datadir}/0ad/
+%{_datadir}/applications/0ad.desktop
+%{_datadir}/icons/hicolor/128x128/apps/0ad.png
+%{_datadir}/metainfo/0ad.appdata.xml
%{_mandir}/man6/*.6*
%changelog
* Wed Feb 06 2019 Kalev Lember <klember(a)redhat.com> - 0.0.23b-5
- Correctly set RPATH for private libraries
+- Install the icon to the hicolor icon theme
+- Move the appdata file to metainfo directory
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.0.23b-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 808bb589273b1ab4d668a91220bf6e00581160e6
Author: Kalev Lember <klember(a)redhat.com>
Date: Wed Feb 6 16:25:08 2019 +0100
Drop a sed hack
This is no longer needed as the desktop file is fixed upstream.
diff --git a/0ad.spec b/0ad.spec
index 6ef635e..2afb149 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -137,9 +137,6 @@ rm -fr libraries/source/nvtt
rm -fr libraries/source/valgrind
-# TODO: drop once fixed in upstream:
http://trac.wildfiregames.com/ticket/4319#ticket
-sed -i -e "/^URL=/d" build/resources/0ad.desktop
-
#-----------------------------------------------------------------------
%build
export CFLAGS="%{optflags}"
commit a2935abb20fb259d19f97005175d22b3ecb47cf0
Author: Kalev Lember <klember(a)redhat.com>
Date: Wed Feb 6 16:19:32 2019 +0100
Correctly set RPATH for private libraries
Fix the --bindir/libdir/datadir args passed to premake: they need to
have = in it for premake to understand it. Getting this right makes the
build system correctly set RPATH so that it's set to $libdir/0ad where
we have the private libs.
This makes it possible to drop the 0ad-rpath.patch and 0ad launcher
shell script that set LD_LIBRARY_PATH and instead just rely on the
RPATH and the datadir being correct.
diff --git a/0ad-rpath.patch b/0ad-rpath.patch
deleted file mode 100644
index a27f3c0..0000000
--- a/0ad-rpath.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake4.lua
0ad-0.0.23-alpha/build/premake/premake4.lua
---- 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 2018-04-29 17:44:48.000000000 +0200
-+++ 0ad-0.0.23-alpha/build/premake/premake4.lua 2018-05-22 13:23:25.238894337 +0200
-@@ -356,26 +356,6 @@
- defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
- end
-
-- if os.is("linux") or os.is("bsd") then
-- -- To use our local shared libraries, they need to be found in the
-- -- runtime dynamic linker path. Add their path to -rpath.
-- if _OPTIONS["libdir"] then
-- linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] }
-- else
-- -- On FreeBSD we need to allow use of $ORIGIN
-- if os.is("bsd") then
-- linkoptions { "-Wl,-z,origin" }
-- end
--
-- -- Adding the executable path and taking care of correct escaping
-- if _ACTION == "gmake" then
-- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
-- elseif _ACTION == "codeblocks" then
-- linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
-- end
-- end
-- end
--
- end
- end
-
-diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake5.lua
0ad-0.0.23-alpha/build/premake/premake5.lua
---- 0ad-0.0.23-alpha.orig/build/premake/premake5.lua 2018-04-22 20:14:45.000000000 +0200
-+++ 0ad-0.0.23-alpha/build/premake/premake5.lua 2018-05-22 13:23:29.022903711 +0200
-@@ -344,26 +344,6 @@
- defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
- end
-
-- if os.istarget("linux") or os.istarget("bsd") then
-- -- To use our local shared libraries, they need to be found in the
-- -- runtime dynamic linker path. Add their path to -rpath.
-- if _OPTIONS["libdir"] then
-- linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] }
-- else
-- -- On FreeBSD we need to allow use of $ORIGIN
-- if os.istarget("bsd") then
-- linkoptions { "-Wl,-z,origin" }
-- end
--
-- -- Adding the executable path and taking care of correct escaping
-- if _ACTION == "gmake" then
-- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
-- elseif _ACTION == "codeblocks" then
-- linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
-- end
-- end
-- end
--
- end
- end
-
diff --git a/0ad.spec b/0ad.spec
index bbd9c13..6ef635e 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -19,7 +19,7 @@
Name: 0ad
Version: 0.0.23b
-Release: 4%{?dist}
+Release: 5%{?dist}
# BSD License:
# build/premake/*
# libraries/source/miniupnpc/* (not built/used)
@@ -98,9 +98,6 @@ BuildRequires: /usr/bin/python
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
-#
http://trac.wildfiregames.com/ticket/1421
-Patch0: %{name}-rpath.patch
-
# Only do fcollada debug build with enabling debug maintainer mode
# It also prevents assumption there that it is building in x86
Patch1: %{name}-debug.patch
@@ -127,7 +124,6 @@ hobbyist game developers, since 2001.
#-----------------------------------------------------------------------
%prep
%setup -q -n %{name}-%{version}-alpha
-%patch0 -p1
%if ! %{with debug}
# disable debug build, and "int 0x3" to trap to debugger (x86 only)
%patch1 -p0
@@ -150,9 +146,9 @@ export CFLAGS="%{optflags}"
# avoid warnings with gcc 4.7 due to _FORTIFY_SOURCE in CPPFLAGS
export CPPFLAGS="`echo %{optflags} | sed -e
's/-Wp,-D_FORTIFY_SOURCE=2//'`"
build/workspaces/update-workspaces.sh \
- --bindir %{_bindir} \
- --datadir %{_datadir}/%{name} \
- --libdir %{_libdir}/%{name} \
+ --bindir=%{_bindir} \
+ --datadir=%{_datadir}/%{name} \
+ --libdir=%{_libdir}/%{name} \
--with-system-mozjs38 \
%if %{with system_nvtt}
--with-system-nvtt \
@@ -176,6 +172,7 @@ LD_LIBRARY_PATH=binaries/system binaries/system/test%{dbg} -libdir
binaries/syst
#-----------------------------------------------------------------------
%install
install -d -m 755 %{buildroot}%{_bindir}
+install -p -m 755 build/resources/0ad.sh %{buildroot}%{_bindir}/0ad
install -p -m 755 binaries/system/pyrogenesis%{dbg}
%{buildroot}%{_bindir}/pyrogenesis%{dbg}
install -d -m 755 %{buildroot}%{_libdir}/%{name}
@@ -207,14 +204,6 @@ ln -sf %{name}.6 %{buildroot}%{_mandir}/man6/pyrogenesis.6
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-cat > %{buildroot}%{_bindir}/0ad <<EOF
-#!/bin/sh
-
-cd %{_datadir}/0ad
-LD_LIBRARY_PATH=%{_libdir}/0ad %{_bindir}/pyrogenesis%{dbg} "\$@"
-EOF
-chmod +x %{buildroot}%{_bindir}/0ad
-
%if %{with debug}
export STRIP=/bin/true
%endif
@@ -234,6 +223,9 @@ export STRIP=/bin/true
%{_mandir}/man6/*.6*
%changelog
+* Wed Feb 06 2019 Kalev Lember <klember(a)redhat.com> - 0.0.23b-5
+- Correctly set RPATH for private libraries
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.0.23b-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild