From f4eb986697c63e06f829688213d1e74bed784c55 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 27 Sep 2022 16:55:32 -0400 Subject: [PATCH] import fwupd-1.7.8-1.el8 --- .fwupd.metadata | 6 +++--- .gitignore | 6 +++--- SPECS/fwupd.spec | 44 +++++++++++++++++++++++++++++++++----------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/.fwupd.metadata b/.fwupd.metadata index a8d094f..19c69f0 100644 --- a/.fwupd.metadata +++ b/.fwupd.metadata @@ -4,6 +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 -6e89977a382f3725f9b6abf3262d102163ad20f1 SOURCES/fwupd-1.7.1.tar.xz -3dd8f6ba4af65d5ecc304d57fb2453fa08d91199 SOURCES/fwupd-efi-1.1.tar.xz -eea74ef2eaf7fd6799ef9933d5d3f57d9e0ce5ca SOURCES/libjcat-0.1.8.tar.xz +59006fd556faeacc8185075c8fe7826249a2da32 SOURCES/fwupd-1.7.8.tar.xz +1a586c3634ef190e6128351ee60fd17d0e584f7c SOURCES/fwupd-efi-1.3.tar.xz +a62a28924d26cd49b6441170795a237ba33ec192 SOURCES/libjcat-0.1.9.tar.xz diff --git a/.gitignore b/.gitignore index 5e6280d..5b65834 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +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.7.1.tar.xz -SOURCES/fwupd-efi-1.1.tar.xz -SOURCES/libjcat-0.1.8.tar.xz +SOURCES/fwupd-1.7.8.tar.xz +SOURCES/fwupd-efi-1.3.tar.xz +SOURCES/libjcat-0.1.9.tar.xz diff --git a/SPECS/fwupd.spec b/SPECS/fwupd.spec index ac9797f..15ce573 100644 --- 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 fwupdplugin_version 4 +%global fwupdplugin_version 5 # 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 @@ -39,13 +39,13 @@ Summary: Firmware update daemon Name: fwupd -Version: 1.7.1 +Version: 1.7.8 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.8.tar.xz -Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.1.tar.xz +Source1: http://people.freedesktop.org/~hughsient/releases/libjcat-0.1.9.tar.xz +Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.3.tar.xz Source10: http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab Source11: http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab @@ -70,7 +70,6 @@ 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} @@ -82,7 +81,6 @@ BuildRequires: gcab BuildRequires: valgrind BuildRequires: valgrind-devel %endif -BuildRequires: elfutils-libelf-devel BuildRequires: gtk-doc BuildRequires: gnutls-devel BuildRequires: gnutls-utils @@ -159,6 +157,7 @@ Files for development with %{name}. %package tests Summary: Data files for installed tests +Requires: %{name}%{?_isa} = %{version}-%{release} %description tests Data files for installed tests. @@ -241,8 +240,13 @@ export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 %else -Dplugin_modem_manager=false \ %endif + -Dplugin_logitech_bulkcontroller=false \ -Dman=true \ -Dbluez=false \ + -Dplugin_cfu=false \ + -Dplugin_mtd=false \ + -Dplugin_powerd=false \ + -Dplugin_uf2=false \ -Dsupported_build=true %meson_build @@ -335,8 +339,8 @@ done %{_sysconfdir}/pki/fwupd-metadata %if 0%{?have_msr} /usr/lib/modules-load.d/fwupd-msr.conf +%config(noreplace)%{_sysconfdir}/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 @@ -400,13 +404,11 @@ done %{_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 @@ -424,6 +426,7 @@ done %{_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_genesys.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 @@ -438,6 +441,7 @@ done %{_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_nordic_hid.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 @@ -448,7 +452,7 @@ done %{_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_scsi.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_steelseries.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_superio.so %if 0%{?have_dell} @@ -471,8 +475,8 @@ done %{_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_usi_dock.so %{_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 @@ -512,6 +516,9 @@ done %{_datadir}/installed-tests/fwupd/*.test %{_datadir}/installed-tests/fwupd/*.cab %{_datadir}/installed-tests/fwupd/*.sh +%if 0%{?have_uefi} +%{_datadir}/installed-tests/fwupd/efi +%endif %{_datadir}/fwupd/device-tests/*.json %{_libexecdir}/installed-tests/fwupd/* %dir %{_sysconfdir}/fwupd/remotes.d @@ -519,6 +526,21 @@ done %endif %changelog +* Wed Jun 15 2022 Richard Hughes 1.7.8-1 +- New upstream release +- Resolves: rhbz#2095668 + +* Thu Jan 13 2022 Richard Hughes 1.7.4-1 +- Include support for Lenovo TBT4 Docking stations +- Do not cause systemd-modules-load failures +- Resolves: rhbz#2038258 +- Resolves: rhbz#2037294 + +* Thu Dec 09 2021 Richard Hughes 1.7.1-2 +- Disable the Logitech bulkcontroller plugin to avoid adding a dep to protobuf-c + which lives in AppStream, not BaseOS. +- Resolves: rhbz#2029333 + * Mon Nov 01 2021 Richard Hughes 1.7.1-1 - New upstream release - Backport upstream changes