The package rpms/fwts.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/fwts.git/commit/?id=9b58d707ebf26....
Change:
+ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
Thanks.
Full change:
============
commit 9b58d707ebf26f97e4e0e0f232f8835318f6d3c2
Author: Benjamin Berg <bberg(a)redhat.com>
Date: Thu Nov 26 14:18:25 2020 +0100
New upstream release 20.11.00 (#1815208)
This release also enables building on riscv
diff --git a/.gitignore b/.gitignore
index 426d170..a3feba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/fwts-V18.06.02.tar.gz
/fwts-V19.02.00.tar.gz
/fwts-V20.02.00.tar.gz
+/fwts-V20.11.00.tar.gz
diff --git a/0001-apica-Fix-symbol-visibility-and-declaration-issues.patch
b/0001-apica-Fix-symbol-visibility-and-declaration-issues.patch
deleted file mode 100644
index bf1c018..0000000
--- a/0001-apica-Fix-symbol-visibility-and-declaration-issues.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 79da34821ae16d40a4b16a26a0a09dc0a99fd444 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg(a)redhat.com>
-Date: Tue, 3 Mar 2020 13:36:49 +0100
-Subject: [PATCH] apica: Fix symbol visibility and declaration issues
-
-Without this the variables are defined multiple times, causing linker
-issues on newer compilers.
----
- src/acpica/source/compiler/aslcompiler.l | 2 +-
- src/acpica/source/compiler/dtcompiler.h | 2 +-
- src/acpica/source/compiler/dtparser.l | 2 +-
- src/acpica/source/compiler/prparser.l | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/acpica/source/compiler/aslcompiler.l
b/src/acpica/source/compiler/aslcompiler.l
-index 797f9899..399bd6bd 100644
---- a/src/acpica/source/compiler/aslcompiler.l
-+++ b/src/acpica/source/compiler/aslcompiler.l
-@@ -156,7 +156,7 @@
-
- #include <stdlib.h>
- #include <string.h>
--YYSTYPE AslCompilerlval;
-+extern YYSTYPE AslCompilerlval;
-
- /*
- * Generation: Use the following command line:
-diff --git a/src/acpica/source/compiler/dtcompiler.h
b/src/acpica/source/compiler/dtcompiler.h
-index 9d9008a8..cd47263d 100644
---- a/src/acpica/source/compiler/dtcompiler.h
-+++ b/src/acpica/source/compiler/dtcompiler.h
-@@ -461,7 +461,7 @@ DtCreateTableUnit (
-
- /* dtparser - lex/yacc files */
-
--UINT64 DtCompilerParserResult; /* Expression return value */
-+extern UINT64 DtCompilerParserResult; /* Expression return value */
- int
- DtCompilerParserparse (
- void);
-diff --git a/src/acpica/source/compiler/dtparser.l
b/src/acpica/source/compiler/dtparser.l
-index ff7df507..631921df 100644
---- a/src/acpica/source/compiler/dtparser.l
-+++ b/src/acpica/source/compiler/dtparser.l
-@@ -208,7 +208,7 @@ NewLine [\n]
- /*
- * Local support functions
- */
--YY_BUFFER_STATE LexBuffer;
-+static YY_BUFFER_STATE LexBuffer;
-
- /******************************************************************************
- *
-diff --git a/src/acpica/source/compiler/prparser.l
b/src/acpica/source/compiler/prparser.l
-index 65595fa8..8752d3fc 100644
---- a/src/acpica/source/compiler/prparser.l
-+++ b/src/acpica/source/compiler/prparser.l
-@@ -224,7 +224,7 @@ Identifier [a-zA-Z][0-9a-zA-Z]*
- /*
- * Local support functions
- */
--YY_BUFFER_STATE LexBuffer;
-+static YY_BUFFER_STATE LexBuffer;
-
-
- /******************************************************************************
---
-2.24.1
-
diff --git a/fwts-20.02.00-json_0_14_compat.patch b/fwts-20.02.00-json_0_14_compat.patch
deleted file mode 100644
index 5b8e11a..0000000
--- a/fwts-20.02.00-json_0_14_compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: fwts-20.02.00/src/lib/include/fwts_json.h
-===================================================================
---- fwts-20.02.00.orig/src/lib/include/fwts_json.h
-+++ fwts-20.02.00/src/lib/include/fwts_json.h
-@@ -22,6 +22,20 @@
-
- #include <json.h>
-
-+/*
-+ * json-c 0.13.99 does not define TRUE/FALSE anymore
-+ * the json-c maintainers replaced them with pure 1/0
-+ *
https://github.com/json-c/json-c/commit/0992aac61f8b
-+ */
-+#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) |
99)
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+#endif
-+
- #define __FWTS_JSON_ERR_PTR__ ((json_object*) -1)
- /*
- * Older versions of json-c may return an error in an
diff --git a/fwts-Remove-Werror-from-build.patch b/fwts-Remove-Werror-from-build.patch
index 611443a..69d01da 100644
--- a/fwts-Remove-Werror-from-build.patch
+++ b/fwts-Remove-Werror-from-build.patch
@@ -1,4 +1,4 @@
-From 924141e9a4b781fcbb004c32c2e8fcd04ec00715 Mon Sep 17 00:00:00 2001
+From aa3ac826d874092cd15ba44dd037790df349a3d8 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg(a)redhat.com>
Date: Wed, 6 Mar 2019 11:32:05 +0100
Subject: [PATCH] Remove -Werror from build
@@ -11,7 +11,7 @@ Subject: [PATCH] Remove -Werror from build
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 0109d644..3ca599e1 100644
+index f40c3678..0ff5025b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
@@ -22,7 +22,7 @@ index 0109d644..3ca599e1 100644
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/Makefile.am b/src/Makefile.am
-index 62c9ba8f..38494d2c 100644
+index b7f3f7db..cbf3b5a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
@@ -31,14 +31,14 @@ index 62c9ba8f..38494d2c 100644
-pthread `pkg-config --cflags glib-2.0 gio-2.0` \
- -Wall -Werror -Wextra \
+ -Wall -Wextra \
- -Wno-address-of-packed-member
-
- bin_PROGRAMS = fwts
+ -Wno-address-of-packed-member \
+ -Wfloat-equal -Wmissing-declarations \
+ -Wno-long-long -Wredundant-decls -Wshadow \
diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
-index 6bcf9f86..403f2f24 100644
+index 2c3c1cb7..288d3094 100644
--- a/src/lib/src/Makefile.am
+++ b/src/lib/src/Makefile.am
-@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
+@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
`pkg-config --silence-errors --cflags json-c` \
`pkg-config --cflags glib-2.0 gio-2.0` \
-DDATAROOTDIR=\"$(datarootdir)\" \
@@ -48,7 +48,7 @@ index 6bcf9f86..403f2f24 100644
pkglib_LTLIBRARIES = libfwts.la
diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am
-index 21f969e4..82009a06 100644
+index 2ae86038..8b37ba4f 100644
--- a/src/utilities/Makefile.am
+++ b/src/utilities/Makefile.am
@@ -16,7 +16,7 @@
@@ -58,8 +58,8 @@ index 21f969e4..82009a06 100644
-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \
+AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \
`pkg-config --silence-errors --cflags json` \
- `pkg-config --silence-errors --cflags json-c`
-
+ `pkg-config --silence-errors --cflags json-c` \
+ -I../lib/include
--
-2.20.1
+2.26.2
diff --git a/fwts.spec b/fwts.spec
index 1eb6cc8..3231eba 100644
--- a/fwts.spec
+++ b/fwts.spec
@@ -1,8 +1,8 @@
Summary: Firmware Test Suite
Name: fwts
-Version: 20.02.00
-Release: 5%{?dist}
+Version: 20.11.00
+Release: 1%{?dist}
# Asked upstream for inclusion of full license texts:
#
https://bugs.launchpad.net/bugs/1712604
# The ACPICA code is licensed under both GPLv2 and Intel ACPI, a few
@@ -13,13 +13,10 @@ Source0:
http://fwts.ubuntu.com/release/fwts-V%{version}.tar.gz
# Upstream refuses to remove -Werror:
https://bugs.launchpad.net/bugs/1687052
Patch0: fwts-Remove-Werror-from-build.patch
-Patch10: 0001-apica-Fix-symbol-visibility-and-declaration-issues.patch
-Patch11: fwts-20.02.00-json_0_14_compat.patch
-
BuildRequires: acpica-tools glib-devel glib2-devel glib json-c-devel libtool automake
autoconf dkms kernel-devel git bison flex
BuildRequires: libbsd-devel
# The tests in this package only make sense on the below architectures.
-ExclusiveArch: x86_64 %{arm} aarch64 s390x %{power64}
+ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
%description
Firmware Test Suite (FWTS) is a test suite that performs sanity checks on
@@ -63,6 +60,10 @@ autoreconf -ivf
%doc debian/copyright
%changelog
+* Thu Nov 26 2020 Benjamin Berg <bberg(a)redhat.com> - 20.11.00-1
+- New upstream release 20.11.00 (#1815208)
+- This release also enables building on riscv
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
20.02.00-5
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 81ce1d7..64016e7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (fwts-V19.02.00.tar.gz) =
79ac688da213d90e92761d61368b6042b8613e669cd887b02b9688fb89f0503d7afcb4de144575b13f36f922fab14fc962d1d156b30ac62c80afb834147332b8
-SHA512 (fwts-V20.02.00.tar.gz) =
a272fa17147bcb4b625551a382c8b71681adee3a8e343e77728a88a7adb82b39ea475543b0202e0b186c62f4b8debe807d4d23ffa71b96bd326070e90ed542a6
+SHA512 (fwts-V20.11.00.tar.gz) =
650fa21ceb4528a6d7fa40ae44c3258e01208186328fce8ca889df2809f82abf9b966c76c99791b3f40b17e5c2efda5b15dd2def4aaf494004778337f5074b55