diff --git a/.gitignore b/.gitignore index 67dc35f..51ef855 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ /DBXUpdate-20200729-x64.cab /fwupd-1.7.1.tar.xz /fwupd-efi-1.1.tar.xz +/fwupd-1.7.4.tar.xz diff --git a/fwupd.spec b/fwupd.spec index eb6f302..3731494 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -5,7 +5,7 @@ %global libjcat_version 0.1.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 @@ -44,7 +44,7 @@ Summary: Firmware update daemon Name: fwupd -Version: 1.7.1 +Version: 1.7.4 Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/fwupd/fwupd @@ -85,7 +85,6 @@ BuildRequires: gcab BuildRequires: valgrind BuildRequires: valgrind-devel %endif -BuildRequires: elfutils-libelf-devel BuildRequires: gtk-doc BuildRequires: gnutls-devel BuildRequires: gnutls-utils @@ -114,7 +113,7 @@ BuildRequires: fontconfig BuildRequires: google-noto-sans-cjk-ttc-fonts BuildRequires: gnu-efi-devel BuildRequires: tpm2-tss-devel >= 2.2.3 -BuildRequires: pesign +BuildRequires: pesign >= 113-20 %endif %if 0%{?have_dell} @@ -164,6 +163,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. @@ -171,6 +171,7 @@ Data files for installed tests. %if 0%{?have_modem_manager} %package plugin-modem-manager Summary: fwupd plugin using ModemManger +Requires: %{name}%{?_isa} = %{version}-%{release} %description plugin-modem-manager This provides the optional package which is only required on hardware that @@ -180,6 +181,7 @@ might have mobile broadband hardware. It is probably not required on servers. %if 0%{?have_flashrom} %package plugin-flashrom Summary: fwupd plugin using flashrom +Requires: %{name}%{?_isa} = %{version}-%{release} %description plugin-flashrom This provides the optional package which is only required on hardware that @@ -249,6 +251,10 @@ tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 %endif -Dman=true \ -Dbluez=false \ + -Dplugin_cfu=false \ + -Dplugin_mtd=false \ + -Dplugin_powerd=false \ + -Dplugin_uf2=false \ -Dsupported_build=true %meson_build @@ -319,7 +325,6 @@ done %{_libexecdir}/fwupd/efi/*.efi.signed %endif %{_bindir}/fwupdate -%{_bindir}/fwupdtpmevlog %endif %{_bindir}/dfu-tool %if 0%{?have_uefi} @@ -373,7 +378,6 @@ done %{_mandir}/man1/fwupdmgr.1* %if 0%{?have_uefi} %{_mandir}/man1/fwupdate.1* -%{_mandir}/man1/fwupdtpmevlog.1* %endif %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg @@ -405,13 +409,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 @@ -443,18 +445,17 @@ 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 %{_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_powerd.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} @@ -473,13 +474,13 @@ done %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_thunderbolt.so %if 0%{?have_uefi} %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_tpm.so -%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_tpm_eventlog.so %{_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_pk.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 @@ -523,6 +524,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 @@ -530,6 +534,14 @@ done %endif %changelog +* Thu Jan 13 2022 Richard Hughes 1.7.4-1 +- New upstream release +- Backport Fedora 34 changes +- Include support for Lenovo TBT4 Docking stations +- Do not cause systemd-modules-load failures +- Build against a new enough pesign +- Resolves: rhbz#2007520 + * Mon Nov 01 2021 Richard Hughes 1.7.1-1 - New upstream release - Backport Fedora 34 changes diff --git a/sources b/sources index d48d4a9..da58ab3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (fwupd-1.7.1.tar.xz) = c5d2406065c73909d3cdf9815e31de386ef3f3cbeb7c2845eeee8655754bfe4b464d2660780a80835349394aeedb1891fcd0b1eee8db33a318095c81faf84297 +SHA512 (fwupd-1.7.4.tar.xz) = af038ba0d32bf97b2a0ea53b431628a5b5c948e161219c2f679d0b481c27e7f3488ac28a27a26aa9490df23d652110e70ba98d700eeb8ff0f99acc08f87e2d8c SHA512 (fwupd-efi-1.1.tar.xz) = 9070672f5238b3cbbd8d67dd72f822ccae58d73a380851ba7f69e4fbd415b96db2e79a73ddd12cb959ef5f158d55846ade7d45ea1d555ac2f4c923d5c3ab85f2 SHA512 (DBXUpdate-20100307-x64.cab) = f8ad56cf015f4cdc5c305856ff1f7a8589c25a2a671708c61883f427f38eb9b6a7abd3f2c8d79ef9d5076222255e42585917f8705a2a4b13f860bad4e02ec409 SHA512 (DBXUpdate-20140413-x64.cab) = 75771876a2309fa8ca083c2e76520173d434229b7cacf1e7636bd9b1bc4f871d745c348b9792bfb65fd9f40ef54c25bb427b1431151e817e7050b7829456731a