From c11e57400c8e84c3565328ab79ca9f5abd3bd437 Mon Sep 17 00:00:00 2001 From: panchenbo Date: Wed, 13 Mar 2024 09:16:42 +0800 Subject: [PATCH 1/3] modify openEuler to %{_vendor} --- fwupd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fwupd.spec b/fwupd.spec index 4a3cec1..1f7fbae 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -43,7 +43,7 @@ Name: fwupd Version: 1.8.17 -Release: 1 +Release: 2 License: LGPLv2+ Summary: Make updating firmware on Linux automatic, safe and reliable URL: https://github.com/fwupd/fwupd @@ -279,7 +279,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/fwupd mkdir -p %{buildroot}%{_datadir}/doc mkdir -p %{buildroot}%{_datadir}/doc/fwupd cp -r libfwupd* %{buildroot}%{_datadir}/doc/ -cp -r *openEuler-linux*/libfwupd* %{buildroot}%{_datadir}/doc/fwupd/ +cp -r *%{_vendor}-linux*/libfwupd* %{buildroot}%{_datadir}/doc/fwupd/ sed -i '/DynamicUser=yes/d' %{buildroot}/usr/lib/systemd/system/fwupd-refresh.service @@ -471,6 +471,9 @@ done %{_datadir}/man/man1/* %changelog +* Wed Mar 13 2024 panchenbo - 1.8.17-2 +- modify openEuler to %{_vendor} + * Wed Oct 18 2023 yaoxin - 1.8.17-1 - Upgrade to 1.8.17 -- Gitee From e875944f3736e8119adb0d200305c057548726ed Mon Sep 17 00:00:00 2001 From: jchzhou Date: Wed, 13 Mar 2024 15:57:28 +0800 Subject: [PATCH 2/3] fix the conditional to skip packaging fwupd-detect-cet when building with clang --- fwupd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fwupd.spec b/fwupd.spec index 1f7fbae..ba65f2b 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -43,7 +43,7 @@ Name: fwupd Version: 1.8.17 -Release: 2 +Release: 3 License: LGPLv2+ Summary: Make updating firmware on Linux automatic, safe and reliable URL: https://github.com/fwupd/fwupd @@ -343,7 +343,7 @@ done %{_libexecdir}/fwupd/fwupd # depending on compiler behavior # currently skipped from building if compiled by llvm -%if "%toolchain" == "llvm" +%if "%toolchain" == "clang" %else %ifarch i686 x86_64 %{_libexecdir}/fwupd/fwupd-detect-cet @@ -471,6 +471,9 @@ done %{_datadir}/man/man1/* %changelog +* Wed Mar 13 2024 jchzhou - 1.8.17-3 +- Fix the conditional at L346: replace expected toolchain value to 'clang' + * Wed Mar 13 2024 panchenbo - 1.8.17-2 - modify openEuler to %{_vendor} -- Gitee From aa30e9b06f90c71542b7e00f1919b6a35eb3c33b Mon Sep 17 00:00:00 2001 From: Yinsist Date: Sun, 28 Apr 2024 14:46:49 +0000 Subject: [PATCH 3/3] first check if Valgrind supports the architecture --- fwupd.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fwupd.spec b/fwupd.spec index ba65f2b..003034e 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -43,7 +43,7 @@ Name: fwupd Version: 1.8.17 -Release: 3 +Release: 4 License: LGPLv2+ Summary: Make updating firmware on Linux automatic, safe and reliable URL: https://github.com/fwupd/fwupd @@ -85,8 +85,10 @@ BuildRequires: libarchive-devel BuildRequires: gobject-introspection-devel BuildRequires: gcab meson >= 0.61.0 BuildRequires: protobuf-c protobuf-c-devel tpm2-tss-devel +%if "%{valgrind_arches}" BuildRequires: valgrind BuildRequires: valgrind-devel +%endif BuildRequires: python3 ninja-build python3-jinja2 python3-toml python BuildRequires: gnutls-devel BuildRequires: gnutls-utils @@ -471,6 +473,9 @@ done %{_datadir}/man/man1/* %changelog +* Sun Apr 28 2024 yinsist - 1.8.17-4 +- Valgrind does not support certain architectures like RISC-V, Before depending on Valgrind, first check if Valgrind supports the architecture + * Wed Mar 13 2024 jchzhou - 1.8.17-3 - Fix the conditional at L346: replace expected toolchain value to 'clang' -- Gitee