update to 1.5.8

Set-polling-self-tests-to-slow.patch

@@ -1,47 +0,0 @@
-From dd0b437d866878faa4672518b4b732e8ac00aa30 Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@dell.com>
-Date: Tue, 22 Oct 2019 09:29:41 -0500
-Subject: [PATCH] trivial: fu-self-test: set polling self tests to slow
-
-Currently the test runs for 100ms and looks to see that at least 8 times
-the poll function callback hit.
-
-This normally works well enough, but during self tests it depends upon
-too much timing and leads to failures sometimes:
-
-```
-** (/<<PKGBUILDDIR>>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.189: poll cnt=0
-*# DEBUG: poll cnt=1
-** (/<<PKGBUILDDIR>>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.199: poll cnt=1
-*** (/<<PKGBUILDDIR>>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.209: poll cnt=2
-** (/<<PKGBUILDDIR>>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.227: poll cnt=3
-*# DEBUG: poll cnt=4
-** (/<<PKGBUILDDIR>>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.255: poll cnt=4
-*# DEBUG: poll cnt=5
-** (/<<PKGBUILDDIR>>/obj-s390x-linux-gnu/src/fu-self-test:50432): DEBUG: 15:37:55.267: poll cnt=5
-Bail out! ERROR:../src/fu-self-test.c:3489:fu_device_poll_func: assertion failed (cnt >= 8): (6 >= 8)
---- stderr ---
-**
-ERROR:../src/fu-self-test.c:3489:fu_device_poll_func: assertion failed (cnt >= 8): (6 >= 8)
--------
-```
-
-Mark this as a slow test so that it doesn't cause CI failures.
----
- src/fu-self-test.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/fu-self-test.c b/src/fu-self-test.c
-index 869b76fc5..2f4a83aa8 100644
---- a/src/fu-self-test.c
-+++ b/src/fu-self-test.c
-@@ -4149,7 +4149,8 @@ main (int argc, char **argv)
- 	g_test_add_func ("/fwupd/archive{cab}", fu_archive_cab_func);
- 	g_test_add_func ("/fwupd/engine{requirements-other-device}", fu_engine_requirements_other_device_func);
- 	g_test_add_func ("/fwupd/device{incorporate}", fu_device_incorporate_func);
--	g_test_add_func ("/fwupd/device{poll}", fu_device_poll_func);
-+	if (g_test_slow ())
-+		g_test_add_func ("/fwupd/device{poll}", fu_device_poll_func);
- 	g_test_add_func ("/fwupd/device-locker{success}", fu_device_locker_func);
- 	g_test_add_func ("/fwupd/device-locker{fail}", fu_device_locker_fail_func);
- 	g_test_add_func ("/fwupd/device{metadata}", fu_device_metadata_func);

fwupd.spec

@@ -8,20 +8,18 @@
 %endif
 
 Name:           fwupd
-Version:        1.2.14
+Version:        1.5.8
 Release:        1
 Summary:        Make updating firmware on Linux automatic, safe and reliable
 License:        LGPLv2+
 URL:            https://github.com/fwupd/fwupd/releases
-Source0:        https://github.com/fwupd/fwupd/archive/refs/tags/%{version}.tar.gz
+Source0:        http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-
-#Self-tests are failing due to an expired cert #1264
-Patch6000:         Set-polling-self-tests-to-slow.patch
 
 BuildRequires:	gettext glib2-devel libxmlb-devel valgrind valgrind-devel libgcab1-devel
 BuildRequires:  gpgme-devel libgudev1-devel libgusb-devel libsoup-devel polkit-devel sqlite-devel libxslt
 BuildRequires:  gobject-introspection-devel libarchive-devel systemd gcab elfutils-libelf-devel
 BuildRequires:  bash-completion json-glib-devel help2man vala meson gnutls-utils gnutls-devel gtk-doc
+BuildRequires:  libjcat-devel tpm2-tss-devel
 
 %if %{with uefi}
 BuildRequires: python3 python3-cairo python3-gobject python3-pillow
@@ -37,7 +35,7 @@ BuildRequires: efivar-devel
 BuildRequires: efivar-devel libsmbios-devel
 %endif
 
-Requires:      glib2 bubblewrap libsoup libgusb libxmlb shared-mime-info
+Requires:      glib2 bubblewrap libsoup libgusb libxmlb shared-mime-info libjcat tpm2-tss
 Requires(post):systemd
 Requires(preun):systemd
 Requires(postun):systemd
@@ -49,7 +47,7 @@ Recommends:    python3
 
 %package devel
 Summary:       Development and installed test files for %{name}
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release} libjcat-devel
 Provides:      %{name}-tests = %{version}-%{release}
 Obsoletes:     %{name}-tests < %{version}-%{release}
 
@@ -64,9 +62,9 @@ This package contains the development and installed test files for %{name}.
 %build
 %meson -Dtests=true -Dgtkdoc=true -Dplugin_dummy=true \
 %if %{with uefi}
-       -Dplugin_uefi=true -Dplugin_nvme=true \
+       -Dplugin_nvme=true \
 %else
-       -Dplugin_uefi=false -Dplugin_nvme=false \
+       -Dplugin_nvme=false \
 %endif
 %if %{with redfish}
        -Dplugin_redfish=true \
@@ -74,10 +72,11 @@ This package contains the development and installed test files for %{name}.
        -Dplugin_redfish=false \
 %endif
 %if %{with libsmbios}
-       -Dplugin_dell=true -Dplugin_synaptics=true \
+       -Dplugin_dell=true \
 %else
-       -Dplugin_dell=false -Dplugin_synaptics=false \
+       -Dplugin_dell=false \
 %endif
+       -Dplugin_msr=false \
        -Dman=true
 
 %meson_build
@@ -120,53 +119,53 @@ mkdir -pm 0700 %{buildroot}%{_localstatedir}/lib/%{name}/gnupg
 %config(noreplace)%{_sysconfdir}/%{name}/remotes.d/*.conf
 %config(noreplace)%{_sysconfdir}/pki/%{name}
 %config(noreplace)%{_sysconfdir}/%{name}/daemon.conf
+%config(noreplace)%{_sysconfdir}/%{name}/thunderbolt.conf
+%config(noreplace)%{_sysconfdir}/%{name}/uefi_capsule.conf
+%config(noreplace)%{_sysconfdir}/%{name}/upower.conf
 %{_sysconfdir}/pki/fwupd-metadata
-%{_sysconfdir}/dbus-1/system.d/*.%{name}.conf
+%{_datadir}/dbus-1/system.d/*.%{name}.conf
 %{_libexecdir}/%{name}/%{name}
-%{_libexecdir}/%{name}/%{name}tool
-%{_libexecdir}/%{name}/%{name}agent
 %{_libexecdir}/%{name}/%{name}offline
 %{_datadir}/bash-*/completions/*
-%{_datadir}/%{name}/metainfo/*.metainfo.xml
-%{_datadir}/%{name}/remotes.d/*/*/*.md
 %{_datadir}/metainfo/*.metainfo.xml
-%{_datadir}/%{name}/firmware-packager
 %{_datadir}/dbus-1/interfaces/*.fwupd.xml
 %{_datadir}/dbus-1/system-services/*.service
 %{_datadir}/polkit-1/*/org.freedesktop*
-%{_datadir}/%{name}/quirks.d/
+%{_datadir}/%{name}/
 %{_datadir}/icons/hicolor/scalable/apps/*.%{name}.svg
 %{_localstatedir}/lib/%{name}/*/*.md
 %{_libdir}/lib%{name}*.so.*
 %{_libdir}/girepository-1.0/*.typelib
-%{_prefix}/lib/udev/rules.d/*.rules
-%{_prefix}/lib/systemd/system*/%{name}.shutdown
 %{_unitdir}/*.service
 %{_unitdir}/*.wants/
 %{_libdir}/fwupd-plugins-3/*.so
 %ghost %{_localstatedir}/lib/fwupd/gnupg
 %if %{with uefi}
-%config(noreplace)%{_sysconfdir}/%{name}/uefi.conf
 %{_libexecdir}/%{name}/efi/*.efi
 %{_libexecdir}/%{name}/efi/*.efi.signed
-%{_libexecdir}/%{name}/fwupdate
-%{_datadir}/*/*/LC_IMAGES/%{name}*
 %endif
 %if %{with redfish}
 %config(noreplace)%{_sysconfdir}/%{name}/redfish.conf
 %endif
-%if %{with libsmbios}
+%{_presetdir}/fwupd-refresh.preset
-%{_datadir}/%{name}/remotes.d/dell*/*
+/usr/lib/udev/rules.d/*.rules
+/usr/lib/systemd/system-shutdown/fwupd.shutdown
+%{_unitdir}/fwupd-refresh.timer
+%ifarch x86_64
+%{_libexecdir}/fwupd/fwupd-detect-cet
 %endif
+%{_datadir}/fish/vendor_completions.d/fwupdmgr.fish
 
 %files devel
 %{_libdir}/*.so
 %{_libdir}/*/*.pc
 %{_includedir}/*
 %{_datadir}/vala/*
-%{_datadir}/gtk-doc/*/lib%{name}
+%{_datadir}/gtk-doc/*/%{name}
+%{_datadir}/doc/%{name}
 %{_datadir}/*/*.gir
 %{_datadir}/installed-tests/%{name}
+%{_libexecdir}/installed-tests/%{name}
 %dir %{_sysconfdir}/%{name}/remotes.d
 %config(noreplace)%{_sysconfdir}/%{name}/remotes.d/%{name}-tests.conf
 
@@ -174,6 +173,9 @@ mkdir -pm 0700 %{buildroot}%{_localstatedir}/lib/%{name}/gnupg
 %{_datadir}/man/man1/*
 
 %changelog
+* Mon Jun 17 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.5.8-1
+- Upgrade to 1.5.8
+
 * Wed Jun 15 2022 xigaoxinyan <xigaoxinyan@h-partners.com> - 1.2.14-1
 - Update to 1.2.14