The package rpms/wlcs.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/wlcs.git/commit/?id=8908eb24c0104....
Change:
+%ifarch s390 s390x
Thanks.
Full change:
============
commit ecf656538fe648c7f593eab0ca07597f084f5cb4
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Sat Jul 13 20:04:51 2019 -0400
Fix pkgconfig file to point to runner binaries
diff --git a/0001-pkgconfig-Actually-point-to-the-correct-runner-binar.patch
b/0001-pkgconfig-Actually-point-to-the-correct-runner-binar.patch
new file mode 100644
index 0000000..2c7a6b2
--- /dev/null
+++ b/0001-pkgconfig-Actually-point-to-the-correct-runner-binar.patch
@@ -0,0 +1,32 @@
+From 48479c759b933bb75ed2b0dc2e1b85719921cf52 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa13(a)gmail.com>
+Date: Sat, 13 Jul 2019 20:01:32 -0400
+Subject: [PATCH] pkgconfig: Actually point to the correct runner binary
+
+In 20515298c66595629703e628424cca0c81eb72e0, the install path
+was changed, but the pkgconfig file wasn't fixed alongside it.
+
+Signed-off-by: Neal Gompa <ngompa13(a)gmail.com>
+---
+ wlcs.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/wlcs.pc.in b/wlcs.pc.in
+index e34e7bd..baaebe1 100644
+--- a/wlcs.pc.in
++++ b/wlcs.pc.in
+@@ -1,9 +1,9 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}/@CMAKE_INSTALL_BINDIR@
+-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++libexecdir=${prefix}/@CMAKE_INSTALL_LIBEXECDIR@
+ includedir=${prefix}/include
+
+-test_runner=${libdir}/wlcs/wlcs
++test_runner=${libexecdir}/wlcs/wlcs
+
+ Name: wlcs
+ Description: Wayland Conformance Suite test harness
+--
+2.21.0
+
diff --git a/wlcs.spec b/wlcs.spec
index c2e3dd9..062e08b 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -18,7 +18,7 @@
Name: wlcs
Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Wayland Conformance Test Suite
License: GPLv2 or GPLv3
@@ -28,6 +28,9 @@ Source0:
%{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz
# Install wlcs binaries in the right place
# From:
https://github.com/MirServer/wlcs/pull/114
Patch0001: 0001-cmake-Install-wlcs-runners-in-libexecdir-rather-than.patch
+# Fix pkgconfig file to point to correct location for wlcs binaries
+# From:
https://github.com/MirServer/wlcs/pull/115
+Patch0002: 0001-pkgconfig-Actually-point-to-the-correct-runner-binar.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -107,5 +110,8 @@ developing Wayland compositor tests that use %{name}.
%changelog
+* Sat Jul 13 2019 Neal Gompa <ngompa13(a)gmail.com> - 1.0.0-2
+- Fix pkgconfig file to point to runner binaries
+
* Sat Jul 13 2019 Neal Gompa <ngompa13(a)gmail.com> - 1.0.0-1
- Initial packaging for Fedora
commit 8908eb24c010459e2416b55d11c66c781e4c7b4c
Author: Neal Gompa <ngompa13(a)gmail.com>
Date: Sat Jul 13 19:21:40 2019 -0400
Disable asan for s390x on F30+
diff --git a/wlcs.spec b/wlcs.spec
index f867189..c2e3dd9 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -1,4 +1,13 @@
+
+%if 0%{?fedora} >= 30
+# asan doesn't work with gcc9 on s390x...
+%ifarch s390 s390x
+%bcond_with asan
+%else
%bcond_without asan
+%endif
+%endif
+
%bcond_without ubsan
%ifarch %{ix86} %{arm} s390 s390x