import fwupd-1.7.1-1.el8

2021-12-02 16:38:28 +00:00 · 2021-12-02 16:38:28 +00:00 · b2f9e31f3c
commit b2f9e31f3c
parent 5ff631aae1
6 changed files with 137 additions and 211 deletions
--- a/.fwupd.metadata
+++ b/.fwupd.metadata
@ -4,5 +4,6 @@ a5f73c606abb93bf61625e4628d27a2cd460f162 SOURCES/DBXUpdate-20160809-x64.cab
 b5b2dc87daca1d3f8081a323290432c141aa405d SOURCES/DBXUpdate-20200729-aa64.cab
 3fb407561768a3a2f5fb49d7738b5e0650e70810 SOURCES/DBXUpdate-20200729-ia32.cab
 89db93c9d9d20f81791a262e817b99d8882c8bb0 SOURCES/DBXUpdate-20200729-x64.cab
-9b651aadcfa14f6f783c73e74b8bdac3c4373244 SOURCES/fwupd-1.5.9.tar.xz
-e01a97b6d16a188a43cb25caa42cdf9771803531 SOURCES/libjcat-0.1.5.tar.xz
+6e89977a382f3725f9b6abf3262d102163ad20f1 SOURCES/fwupd-1.7.1.tar.xz
+3dd8f6ba4af65d5ecc304d57fb2453fa08d91199 SOURCES/fwupd-efi-1.1.tar.xz
+eea74ef2eaf7fd6799ef9933d5d3f57d9e0ce5ca SOURCES/libjcat-0.1.8.tar.xz
--- a/.gitignore
+++ b/.gitignore
@ -4,5 +4,6 @@ SOURCES/DBXUpdate-20160809-x64.cab
 SOURCES/DBXUpdate-20200729-aa64.cab
 SOURCES/DBXUpdate-20200729-ia32.cab
 SOURCES/DBXUpdate-20200729-x64.cab
-SOURCES/fwupd-1.5.9.tar.xz
-SOURCES/libjcat-0.1.5.tar.xz
+SOURCES/fwupd-1.7.1.tar.xz
+SOURCES/fwupd-efi-1.1.tar.xz
+SOURCES/libjcat-0.1.8.tar.xz
--- a/SOURCES/0001-Do-not-use-the-LVFS.patch
+++ b/SOURCES/0001-Do-not-use-the-LVFS.patch
@ -1,26 +0,0 @@
-diff --git a/data/remotes.d/lvfs.conf b/data/remotes.d/lvfs.conf
-index 1249ef74..f533bf52 100644
--- a/data/remotes.d/lvfs.conf
-+++ b/data/remotes.d/lvfs.conf
-@@ -1,7 +1,7 @@
- [fwupd Remote]
- 
- # this remote provides metadata and firmware marked as 'stable' from the LVFS
-Enabled=true
-+Enabled=false
- Title=Linux Vendor Firmware Service
- MetadataURI=https://cdn.fwupd.org/downloads/firmware.xml.gz
- ReportURI=https://fwupd.org/lvfs/firmware/report
-diff --git a/libfwupd/fwupd-self-test.c b/libfwupd/fwupd-self-test.c
-index 679360b0..59660360 100644
--- a/libfwupd/fwupd-self-test.c
-+++ b/libfwupd/fwupd-self-test.c
-@@ -182,7 +182,7 @@ fwupd_remote_download_func (void)
- 	g_assert_cmpint (fwupd_remote_get_kind (remote), ==, FWUPD_REMOTE_KIND_DOWNLOAD);
- 	g_assert_cmpint (fwupd_remote_get_keyring_kind (remote), ==, FWUPD_KEYRING_KIND_JCAT);
- 	g_assert_cmpint (fwupd_remote_get_priority (remote), ==, 0);
-	g_assert (fwupd_remote_get_enabled (remote));
-+//	g_assert (fwupd_remote_get_enabled (remote));
- 	g_assert (fwupd_remote_get_metadata_uri (remote) != NULL);
- 	g_assert (fwupd_remote_get_metadata_uri_sig (remote) != NULL);
- 	g_assert_cmpstr (fwupd_remote_get_title (remote), ==, "Linux Vendor Firmware Service");
--- a/SOURCES/deps.patch
+++ b/SOURCES/deps.patch
@ -1,55 +0,0 @@
-diff --git meson.build meson.build
-index 02a93f57..93f77e62 100644
--- meson.build
-+++ meson.build
-@@ -211,7 +211,7 @@ if get_option('bluez')
- endif
- libxmlb = dependency('xmlb', version : '>= 0.1.13', fallback : ['libxmlb', 'libxmlb_dep'])
- if get_option('gusb')
-  gusb = dependency('gusb', version : '>= 0.3.5', fallback : ['gusb', 'gusb_dep'])
-+  gusb = dependency('gusb', version : '>= 0.3.0', fallback : ['gusb', 'gusb_dep'])
-   conf.set('HAVE_GUSB', '1')
- endif
- sqlite = dependency('sqlite3')
-diff --git plugins/cros-ec/fu-cros-ec-usb-device.c plugins/cros-ec/fu-cros-ec-usb-device.c
-index 5bf6f7e1..79a29b2d 100644
--- plugins/cros-ec/fu-cros-ec-usb-device.c
-+++ plugins/cros-ec/fu-cros-ec-usb-device.c
-@@ -109,6 +109,7 @@ static gboolean
- fu_cros_ec_usb_device_find_interface (FuUsbDevice *device,
- 				      GError **error)
- {
-+#if G_USB_CHECK_VERSION(0,3,3)
- 	GUsbDevice *usb_device = fu_usb_device_get_dev (device);
- 	FuCrosEcUsbDevice *self = FU_CROS_EC_USB_DEVICE (device);
- 	g_autoptr(GPtrArray) intfs = NULL;
-@@ -142,6 +143,13 @@ fu_cros_ec_usb_device_find_interface (FuUsbDevice *device,
- 			     FWUPD_ERROR_NOT_FOUND,
- 			     "no update interface found");
- 	return FALSE;
-+#else
-+	g_set_error_literal (error,
-+			     FWUPD_ERROR,
-+			     FWUPD_ERROR_NOT_SUPPORTED,
-+			     "this version of GUsb is not supported");
-+	return FALSE;
-+#endif
- }
- 
- static gboolean
-diff --git a/plugins/dfu/fu-dfu-device.c b/plugins/dfu/fu-dfu-device.c
-index 79854124..2879c6e5 100644
--- plugins/dfu/fu-dfu-device.c
-+++ plugins/dfu/fu-dfu-device.c
-@@ -1262,9 +1262,8 @@ fu_dfu_device_open (FuDevice *device, GError **error)
- 		g_set_error (error,
- 			     FWUPD_ERROR,
- 			     FWUPD_ERROR_NOT_SUPPORTED,
-			     "GUsb version %s too old to support GD32, "
-			     "fwupd needs to be rebuilt against 0.3.6 or later",
-			     g_usb_version_string ());
-+			     "GUsb version too old to support GD32, "
-+			     "fwupd needs to be rebuilt against 0.3.6 or later");
- 		return FALSE;
- #endif
- 	}
--- a/SOURCES/gnuefi-lib-dir-path.patch
+++ b/SOURCES/gnuefi-lib-dir-path.patch
@ -1,29 +0,0 @@
-From 1e8912c79a70ec219ac8ca1af3ab20e42b735481 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue, 13 Apr 2021 18:01:50 +0200
-Subject: [PATCH] uefi-capsule: Don't set gnu-efi lib dir path when using
- custom crt0
-
-The libefi.a and libgnuefi.a libraries are located in /usr/lib64 in RHEL8,
-not in /usr/lib/gnuefi/$gnu_efi_arch/ as is the case in Fedora. This leads
-to the linker not finding these libraries.
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---
- plugins/uefi-capsule/efi/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/plugins/uefi-capsule/efi/meson.build b/plugins/uefi-capsule/efi/meson.build
-index 99654184a20..543474c0311 100644
--- plugins/uefi-capsule/efi/meson.build
-+++ plugins/uefi-capsule/efi/meson.build
-@@ -80,7 +80,6 @@ if host_cpu == 'aarch64' or host_cpu == 'arm'
-     if cmd.returncode() != 0
-       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt_source)))
-       # The gnuefi libraries are still needed
-      efi_libdir = efi_crtdir
-       efi_crtdir = join_paths(meson.current_build_dir(), 'crt0')
-     endif
-   endif
-- 
-2.30.2
--- a/SPECS/fwupd.spec
+++ b/SPECS/fwupd.spec
@ -4,7 +4,7 @@
 %global libcurl_version 7.61.0
 %global systemd_version 231
 %global json_glib_version 1.1.1
-%global __meson_wrap_mode default
+%global fwupdplugin_version 4

 # although we ship a few tiny python files these are utilities that 99.99%
 # of users do not need -- use this to avoid dragging python onto CoreOS
@ -16,6 +16,7 @@
 %endif

 %global enable_dummy 1
+%global __meson_wrap_mode default

 # fwupd.efi is only available on these arches
 %ifarch x86_64 aarch64
@ -32,18 +33,19 @@
 %endif

 # only available recently
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
 %global have_modem_manager 1
 %endif

 Summary:   Firmware update daemon
 Name:      fwupd
-Version:   1.5.9
+Version:   1.7.1
 Release:   1%{?dist}
 License:   LGPLv2+
 URL:       https://github.com/fwupd/fwupd
 Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-Source1:   http://people.freedesktop.org/~hughsient/releases/libjcat-0.1.5.tar.xz
+Source1:   http://people.freedesktop.org/~hughsient/releases/libjcat-0.1.8.tar.xz
+Source2:   http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.1.tar.xz

 Source10:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab
 Source11:  http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab
@ -59,10 +61,6 @@ Source301:   redhatsecureboot301.cer
 Source500:   redhatsecurebootca5.cer
 Source503:   redhatsecureboot503.cer

-Patch2:    0001-Do-not-use-the-LVFS.patch
-Patch4:    deps.patch
-Patch5:    gnuefi-lib-dir-path.patch
-
 BuildRequires: efi-srpm-macros
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@ -72,6 +70,7 @@ BuildRequires: libgudev1-devel
 BuildRequires: libgusb-devel >= %{libgusb_version}
 BuildRequires: libcurl-devel >= %{libcurl_version}
 BuildRequires: polkit-devel >= 0.103
+BuildRequires: protobuf-c-devel
 BuildRequires: sqlite-devel
 BuildRequires: gpgme-devel
 BuildRequires: systemd >= %{systemd_version}
@ -97,11 +96,12 @@ BuildRequires: git-core
 %if 0%{?have_modem_manager}
 BuildRequires: ModemManager-glib-devel >= 1.10.0
 BuildRequires: libqmi-devel >= 1.22.0
+BuildRequires: libmbim-devel
 %endif

 %if 0%{?have_uefi}
 BuildRequires: efivar-devel >= 33
-BuildRequires: python3 python3-cairo python3-gobject python3-pillow
+BuildRequires: python3 python3-cairo python3-gobject
 BuildRequires: pango-devel
 BuildRequires: cairo-devel cairo-gobject-devel
 BuildRequires: freetype
@ -130,11 +130,18 @@ Obsoletes: fwupd-sign < 0.1.6
 Obsoletes: libebitdo < 0.7.5-3
 Obsoletes: libdfu < 1.0.0
 Obsoletes: fwupd-labels < 1.1.0-1
-Obsoletes: fwupdate < 13

 Obsoletes: dbxtool < 9
 Provides: dbxtool

+%if 0%{?rhel} > 7
+Obsoletes: fwupdate < 13
+Obsoletes: fwupdate-efi < 13
+
+Provides: fwupdate
+Provides: fwupdate-efi
+%endif
+
 # optional, but a really good idea
 Recommends: udisks2

@ -158,20 +165,19 @@ Data files for installed tests.

 %prep
 %setup -q
-%patch2 -p1 -b .lvfs-disabled
-%patch4 -p0 -b .deps
-%patch5 -p0 -b .gnuefi

 mkdir -p subprojects/libjcat
 tar xfvs %{SOURCE1} -C subprojects/libjcat --strip-components=1

+mkdir -p subprojects/fwupd-efi
+tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1
+
 sed -ri '1s=^#!/usr/bin/(env )?python3=#!%{__python3}=' \
        contrib/ci/*.py \
        contrib/firmware_packager/*.py \
        contrib/*.py \
        contrib/standalone-installer/assets/*.py \
        contrib/standalone-installer/*.py \
-        data/device-tests/*.py \
        libfwupdplugin/*.py \
        plugins/dfu/contrib/*.py \
        plugins/uefi-capsule/make-images.py \
@ -183,7 +189,8 @@ sed -ri '1s=^#!/usr/bin/(env )?python3=#!%{__python3}=' \
 export RHEL_ALLOW_PYTHON2_FOR_BUILD=1

 %meson \
-    -Dgtkdoc=true \
+    -Ddocs=gtkdoc \
+    -Dlvfs=disabled \
    -Defi_os_dir=%{efi_vendor} \
    -Dlibjcat:gtkdoc=false \
    -Dlibjcat:introspection=false \
@ -208,11 +215,14 @@ export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
 %if 0%{?have_uefi}
    -Dplugin_uefi_capsule=true \
    -Dplugin_uefi_pk=false \
-    -Defi_sbat_distro_id="rhel" \
-    -Defi_sbat_distro_summary="Red Hat Enterprise Linux" \
-    -Defi_sbat_distro_pkgname="%{name}" \
-    -Defi_sbat_distro_version="%{version}" \
-    -Defi_sbat_distro_url="mail:secalert@redhat.com" \
+%ifarch x86_64
+    -Dfwupd-efi:efi_sbat_distro_id="rhel" \
+    -Dfwupd-efi:efi_sbat_distro_summary="Red Hat Enterprise Linux" \
+    -Dfwupd-efi:efi_sbat_distro_pkgname="%{name}" \
+    -Dfwupd-efi:efi_sbat_distro_version="%{version}" \
+    -Dfwupd-efi:efi_sbat_distro_url="mail:secalert@redhat.com" \
+    -Dfwupd-efi:efi-libdir="/usr/lib64" \
+%endif
    -Dplugin_tpm=false \
 %else
    -Dplugin_uefi_capsule=false \
@ -250,13 +260,8 @@ mkdir -p %{buildroot}/%{_datadir}/dbxtool
 install %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{buildroot}/%{_datadir}/dbxtool

 # sign fwupd.efi loader
-%if 0%{?have_uefi}
 %ifarch x86_64
 %global efiarch x64
-%endif
-%ifarch aarch64
-%global efiarch aa64
-%endif
 %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi
 %pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp -a %{SOURCE300} -c %{SOURCE301} -n redhatsecureboot301
 %pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -a %{SOURCE500} -c %{SOURCE503} -n redhatsecureboot503
@ -291,7 +296,6 @@ done
 %doc README.md AUTHORS
 %license COPYING
 %config(noreplace)%{_sysconfdir}/fwupd/daemon.conf
-%config(noreplace)%{_sysconfdir}/fwupd/upower.conf
 %if 0%{?have_uefi}
 %config(noreplace)%{_sysconfdir}/fwupd/uefi_capsule.conf
 %endif
@ -305,7 +309,9 @@ done
 %{_libexecdir}/fwupd/fwupdoffline
 %if 0%{?have_uefi}
 %{_libexecdir}/fwupd/efi/*.efi
+%ifarch x86_64
 %{_libexecdir}/fwupd/efi/*.efi.signed
+%endif
 %{_bindir}/fwupdate
 %endif
 %{_bindir}/dfu-tool
@ -330,6 +336,7 @@ done
 %if 0%{?have_msr}
 /usr/lib/modules-load.d/fwupd-msr.conf
 %endif
+/usr/lib/modules-load.d/fwupd-redfish.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf
 %{_datadir}/bash-completion/completions/fwupdmgr
 %{_datadir}/bash-completion/completions/fwupdtool
@ -378,89 +385,104 @@ done
 %dir %{_localstatedir}/cache/fwupd
 %dir %{_datadir}/fwupd/quirks.d
 %{_datadir}/fwupd/quirks.d/*.quirk
-%{_localstatedir}/lib/fwupd/builder/README.md
-%{_libdir}/libfwupd*.so.*
+%{_datadir}/doc/fwupd/builder/README.md
+%if 0%{?have_uefi}
+%{_sysconfdir}/grub.d/35_fwupd
+%endif
+%{_libdir}/libfwupd.so.2*
+%{_libdir}/libfwupdplugin.so.%{fwupdplugin_version}*
 %{_libdir}/libjcat.so.*
 %{_libdir}/girepository-1.0/Fwupd-2.0.typelib
 %{_libdir}/girepository-1.0/FwupdPlugin-1.0.typelib
 /usr/lib/udev/rules.d/*.rules
 /usr/lib/systemd/system-shutdown/fwupd.shutdown
-%dir %{_libdir}/fwupd-plugins-3
-%{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_dmar.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_facp.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_altos.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_amt.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_ata.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_bcm57xx.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_ccgx.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_colorhug.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_cros_ec.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_cpu.so
+%dir %{_libdir}/fwupd-plugins-%{fwupdplugin_version}
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_dmar.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_facp.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_phat.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_altos.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_amt.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_analogix.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ata.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_bcm57xx.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ccgx.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cfu.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_colorhug.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cros_ec.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cpu.so
 %if 0%{?have_dell}
-%{_libdir}/fwupd-plugins-3/libfu_plugin_dell.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_dell_esrt.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_esrt.so
 %endif
-%{_libdir}/fwupd-plugins-3/libfu_plugin_dell_dock.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_dfu.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_dfu_csr.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_ebitdo.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_elantp.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_emmc.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_ep963x.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_fastboot.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_fresco_pd.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_hailuck.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_iommu.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_jabra.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_lockdown.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_sleep.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_swap.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_tainted.so
-%if 0%{?have_msr}
-%{_libdir}/fwupd-plugins-3/libfu_plugin_msr.so
-%endif
-%{_libdir}/fwupd-plugins-3/libfu_plugin_nitrokey.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_nvme.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_optionrom.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_pci_bcr.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_pci_mei.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_pixart_rf.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_redfish.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_rts54hid.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_rts54hub.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_solokey.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_steelseries.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_superio.so
-%if 0%{?have_dell}
-%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_mst.so
-%endif
-%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_cxaudio.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_prometheus.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_rmi.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_system76_launch.so
-%if 0%{?enable_dummy}
-%{_libdir}/fwupd-plugins-3/libfu_plugin_test.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_invalid.so
-%endif
-%{_libdir}/fwupd-plugins-3/libfu_plugin_thelio_io.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_dock.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu_csr.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ebitdo.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elantp.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elanfp.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_emmc.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ep963x.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fastboot.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fresco_pd.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_hailuck.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_iommu.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_jabra.so
 %if 0%{?have_uefi}
-%{_libdir}/fwupd-plugins-3/libfu_plugin_bios.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_capsule.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_dbx.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_recovery.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_lenovo_thinklmi.so
 %endif
-%{_libdir}/fwupd-plugins-3/libfu_plugin_logind.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_logitech_hidpp.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_upower.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_vli.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_raw.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_usb.so
-%{_libdir}/fwupd-plugins-3/libfu_plugin_goodixmoc.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_lockdown.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_sleep.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_swap.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_tainted.so
+%if 0%{?have_msr}
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_msr.so
+%endif
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nitrokey.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_nvme.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_optionrom.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_parade_lspcon.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_bcr.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pci_mei.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_pixart_rf.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_realtek_mst.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_redfish.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hid.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_rts54hub.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_solokey.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_steelseries.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_superio.so
+%if 0%{?have_dell}
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_mst.so
+%endif
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_cape.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_cxaudio.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_prometheus.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_synaptics_rmi.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_system76_launch.so
+%if 0%{?enable_dummy}
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_test.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_invalid.so
+%endif
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_thelio_io.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_thunderbolt.so
+%if 0%{?have_uefi}
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_bios.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_capsule.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_dbx.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_uefi_recovery.so
+%endif
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logind.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logitech_bulkcontroller.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_logitech_hidpp.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_upower.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_vli.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_wacom_raw.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_wacom_usb.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_goodixmoc.so
 %ghost %{_localstatedir}/lib/fwupd/gnupg

 %if 0%{?have_modem_manager}
-%{_libdir}/fwupd-plugins-3/libfu_plugin_modem_manager.so
+%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_modem_manager.so
 %endif
 %if 0%{?have_uefi}
 %{_datadir}/fwupd/uefi-capsule-ux.tar.xz
@ -477,21 +499,33 @@ done
 %{_libdir}/libjcat.so
 %{_libdir}/pkgconfig/fwupd.pc
 %{_libdir}/pkgconfig/fwupdplugin.pc
+%if 0%{?have_uefi}
+%{_libdir}/pkgconfig/fwupd-efi.pc
+%endif
 %{_libdir}/pkgconfig/jcat.pc

 %files tests
 %if 0%{?enable_tests}
 %dir %{_datadir}/installed-tests/fwupd
+%{_datadir}/installed-tests/fwupd/tests/*
 %{_datadir}/installed-tests/fwupd/fwupd-tests.xml
 %{_datadir}/installed-tests/fwupd/*.test
 %{_datadir}/installed-tests/fwupd/*.cab
 %{_datadir}/installed-tests/fwupd/*.sh
+%{_datadir}/fwupd/device-tests/*.json
 %{_libexecdir}/installed-tests/fwupd/*
 %dir %{_sysconfdir}/fwupd/remotes.d
 %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/fwupd-tests.conf
 %endif

 %changelog
+* Mon Nov 01 2021 Richard Hughes <richard@hughsie.com> 1.7.1-1
+- New upstream release
+- Backport upstream changes
+- Include support for Dell TBT4 Docking stations
+- Resolves: rhbz#1969472
+- Resolves: rhbz#1976408
+
 * Tue Apr 13 2021 Richard Hughes <richard@hughsie.com> 1.5.9-3
 - Rebase to include the SBAT metadata section to allow fixing BootHole
 - Resolves: rhbz#1933012