rpms/fwupd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'c9-beta' into a9-beta

Browse Source
This commit is contained in:
Andrew Lukoshko 2022-10-14 15:45:05 +00:00
commit f935d3dbd6
5 changed files with 203 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.fwupd.metadata
View File

@ -1 +1,8 @@
9b651aadcfa14f6f783c73e74b8bdac3c4373244 SOURCES/fwupd-1.5.9.tar.xz b2620c36bd23ca699567fd4e4add039ee4375247 SOURCES/DBXUpdate-20100307-x64.cab
dfdb1d0d42c1563ca63bd45c7e2ddc48cbfc5023 SOURCES/DBXUpdate-20140413-x64.cab
a5f73c606abb93bf61625e4628d27a2cd460f162 SOURCES/DBXUpdate-20160809-x64.cab
b5b2dc87daca1d3f8081a323290432c141aa405d SOURCES/DBXUpdate-20200729-aa64.cab
3fb407561768a3a2f5fb49d7738b5e0650e70810 SOURCES/DBXUpdate-20200729-ia32.cab
89db93c9d9d20f81791a262e817b99d8882c8bb0 SOURCES/DBXUpdate-20200729-x64.cab
b2919819889051bcaa089a4b7e75e30ea2d80d68 SOURCES/fwupd-1.7.9.tar.xz
1a586c3634ef190e6128351ee60fd17d0e584f7c SOURCES/fwupd-efi-1.3.tar.xz

9
.gitignore vendored
View File

@ -1 +1,8 @@
SOURCES/fwupd-1.5.9.tar.xz SOURCES/DBXUpdate-20100307-x64.cab
SOURCES/DBXUpdate-20140413-x64.cab
SOURCES/DBXUpdate-20160809-x64.cab
SOURCES/DBXUpdate-20200729-aa64.cab
SOURCES/DBXUpdate-20200729-ia32.cab
SOURCES/DBXUpdate-20200729-x64.cab
SOURCES/fwupd-1.7.9.tar.xz
SOURCES/fwupd-efi-1.3.tar.xz

109
SOURCES/13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch
View File

@ -1,109 +0,0 @@
commit 4706031223f6809b40ef7d4c3f14103941621d57
Author: Richard Hughes <richard@hughsie.com>
Date: Fri Apr 9 15:20:13 2021 +0100
Write BMP data directly without using PIL
This allows us to drop a build-time dep.
diff --git a/plugins/uefi-capsule/make-images.py b/plugins/uefi-capsule/make-images.py
index f1b00b8d..1d15bcf3 100755
--- a/plugins/uefi-capsule/make-images.py
+++ b/plugins/uefi-capsule/make-images.py
@@ -16,6 +16,8 @@ import argparse
import tarfile
import math
import io
+import struct
+
from typing import Dict, Optional, Any
import cairo
@@ -24,7 +26,6 @@ import gi
gi.require_version("Pango", "1.0")
gi.require_version("PangoCairo", "1.0")
from gi.repository import Pango, PangoCairo
-from PIL import Image
def languages(podir: str):
@@ -60,6 +61,33 @@ class PotFile:
continue
+def _cairo_surface_write_to_bmp(img: cairo.ImageSurface) -> bytes:
+
+ data = bytes(img.get_data())
+ return (
+ b"BM"
+ + struct.pack(
+ "<ihhiiiihhiiiiii",
+ 54 + len(data), # size of BMP file
+ 0, # unused
+ 0, # unused
+ 54, # pixel array offset
+ 40, # DIB header
+ img.get_width(), # width
+ -img.get_height(), # height (top down)
+ 1, # planes
+ 32, # BPP
+ 0, # no compression
+ len(data), # size of the raw bitmap data
+ 2835, # 72DPI H
+ 2835, # 72DPI V
+ 0, # palette
+ 0, # all colors are important
+ )
+ + data
+ )
+
+
def main(args) -> int:
# open output archive
@@ -164,20 +192,14 @@ def main(args) -> int:
fs.foreach(do_write, None)
img.flush()
- # write PNG
- with io.BytesIO() as io_png:
- img.write_to_png(io_png)
- io_png.seek(0)
-
- # convert to BMP and add to archive
- with io.BytesIO() as io_bmp:
- pimg = Image.open(io_png)
- pimg.save(io_bmp, format="BMP")
- filename = "fwupd-{}-{}-{}.bmp".format(lang, width, height)
- tarinfo = tarfile.TarInfo(filename)
- tarinfo.size = io_bmp.tell()
- io_bmp.seek(0)
- tar.addfile(tarinfo, fileobj=io_bmp)
+ # convert to BMP and add to archive
+ with io.BytesIO() as io_bmp:
+ io_bmp.write(_cairo_surface_write_to_bmp(img))
+ filename = "fwupd-{}-{}-{}.bmp".format(lang, width, height)
+ tarinfo = tarfile.TarInfo(filename)
+ tarinfo.size = io_bmp.tell()
+ io_bmp.seek(0)
+ tar.addfile(tarinfo, fileobj=io_bmp)
# success
return 0
diff --git a/po/test-deps b/po/test-deps
index f5276daa..27b4055b 100755
--- a/po/test-deps
+++ b/po/test-deps
@@ -34,12 +34,6 @@ except ValueError:
print("Error: missing cairo gobject introspection library")
err = 1
-try:
- from PIL import Image
-except ImportError:
- print("Error: missing dependency python pillow (python3-pil)")
- err = 1
-
try:
import cairo
except ImportError:

BIN
SOURCES/clsecureboot001.cer Normal file
View File

Binary file not shown.

288
SPECS/fwupd.spec
View File

@ -10,6 +10,7 @@
%global libjcat_version 0.1.0 %global libjcat_version 0.1.0
%global systemd_version 231 %global systemd_version 231
%global json_glib_version 1.1.1 %global json_glib_version 1.1.1
%global fwupdplugin_version 5
# although we ship a few tiny python files these are utilities that 99.99% # 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 # of users do not need -- use this to avoid dragging python onto CoreOS
@ -48,14 +49,26 @@
Summary: Firmware update daemon Summary: Firmware update daemon
Name: fwupd Name: fwupd
Version: 1.5.9 Version: 1.7.9
Release: 3%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/fwupd/fwupd URL: https://github.com/fwupd/fwupd
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.3.tar.xz
# backport from upstream Source10: http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab
Patch0: 13524af2029c2a8a3fb32ef27c39c214d9b5b13c.patch Source11: http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab
Source12: http://people.redhat.com/rhughes/dbx/DBXUpdate-20160809-x64.cab
Source13: http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-aa64.cab
Source14: http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-ia32.cab
Source15: http://people.redhat.com/rhughes/dbx/DBXUpdate-20200729-x64.cab
# these are numbered high just to keep them wildly away from colliding with
# the real package sources, in order to reduce churn.
Source300: clsecureboot001.cer
Source301: clsecureboot001.cer
Source500: clsecureboot001.cer
Source503: clsecureboot001.cer
BuildRequires: gettext BuildRequires: gettext
BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: glib2-devel >= %{glib2_version}
@ -76,12 +89,10 @@ BuildRequires: gcab
BuildRequires: valgrind BuildRequires: valgrind
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
%endif %endif
BuildRequires: elfutils-libelf-devel
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
BuildRequires: gnutls-utils BuildRequires: gnutls-utils
BuildRequires: meson BuildRequires: meson
BuildRequires: help2man
BuildRequires: json-glib-devel >= %{json_glib_version} BuildRequires: json-glib-devel >= %{json_glib_version}
BuildRequires: vala BuildRequires: vala
BuildRequires: bash-completion BuildRequires: bash-completion
@ -93,6 +104,7 @@ BuildRequires: flashrom-devel >= 1.2-2
%if 0%{?have_modem_manager} %if 0%{?have_modem_manager}
BuildRequires: ModemManager-glib-devel >= 1.10.0 BuildRequires: ModemManager-glib-devel >= 1.10.0
BuildRequires: libqmi-devel >= 1.22.0 BuildRequires: libqmi-devel >= 1.22.0
BuildRequires: libmbim-devel
%endif %endif
%if 0%{?have_uefi} %if 0%{?have_uefi}
@ -105,7 +117,7 @@ BuildRequires: fontconfig
BuildRequires: google-noto-sans-cjk-ttc-fonts BuildRequires: google-noto-sans-cjk-ttc-fonts
BuildRequires: gnu-efi-devel BuildRequires: gnu-efi-devel
BuildRequires: tpm2-tss-devel >= 2.2.3 BuildRequires: tpm2-tss-devel >= 2.2.3
BuildRequires: pesign BuildRequires: pesign >= 113-20
%endif %endif
%if 0%{?have_dell} %if 0%{?have_dell}
@ -155,6 +167,7 @@ Files for development with %{name}.
%package tests %package tests
Summary: Data files for installed tests Summary: Data files for installed tests
Requires: %{name}%{?_isa} = %{version}-%{release}
%description tests %description tests
Data files for installed tests. Data files for installed tests.
@ -162,6 +175,7 @@ Data files for installed tests.
%if 0%{?have_modem_manager} %if 0%{?have_modem_manager}
%package plugin-modem-manager %package plugin-modem-manager
Summary: fwupd plugin using ModemManger Summary: fwupd plugin using ModemManger
Requires: %{name}%{?_isa} = %{version}-%{release}
%description plugin-modem-manager %description plugin-modem-manager
This provides the optional package which is only required on hardware that This provides the optional package which is only required on hardware that
@ -171,6 +185,7 @@ might have mobile broadband hardware. It is probably not required on servers.
%if 0%{?have_flashrom} %if 0%{?have_flashrom}
%package plugin-flashrom %package plugin-flashrom
Summary: fwupd plugin using flashrom Summary: fwupd plugin using flashrom
Requires: %{name}%{?_isa} = %{version}-%{release}
%description plugin-flashrom %description plugin-flashrom
This provides the optional package which is only required on hardware that This provides the optional package which is only required on hardware that
@ -180,10 +195,14 @@ can be flashed using flashrom. It is probably not required on servers.
%prep %prep
%autosetup -p1 %autosetup -p1
mkdir -p subprojects/fwupd-efi
tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1
%build %build
%meson \ %meson \
-Dgtkdoc=true \ -Ddocs=gtkdoc \
-Dlvfs=disabled \
%if 0%{?enable_tests} %if 0%{?enable_tests}
-Dtests=true \ -Dtests=true \
%else %else
@ -208,11 +227,15 @@ can be flashed using flashrom. It is probably not required on servers.
%if 0%{?have_uefi} %if 0%{?have_uefi}
-Dplugin_uefi_capsule=true \ -Dplugin_uefi_capsule=true \
-Dplugin_uefi_pk=true \ -Dplugin_uefi_pk=true \
-Defi_sbat_distro_id="almalinux" \ -Defi_os_dir=%{efi_vendor} \
-Defi_sbat_distro_summary="AlmaLinux" \ %ifarch x86_64
-Defi_sbat_distro_pkgname="%{name}" \ -Dfwupd-efi:efi_sbat_distro_id="almalinux" \
-Defi_sbat_distro_version="%{version}" \ -Dfwupd-efi:efi_sbat_distro_summary="AlmaLinux" \
-Defi_sbat_distro_url="security@almalinux.org" \ -Dfwupd-efi:efi_sbat_distro_pkgname="%{name}" \
-Dfwupd-efi:efi_sbat_distro_version="%{version}" \
-Dfwupd-efi:efi_sbat_distro_url="maito:security@almalinux.org" \
-Dfwupd-efi:efi-libdir="/usr/lib64" \
%endif
-Dplugin_tpm=true \ -Dplugin_tpm=true \
%else %else
-Dplugin_uefi_capsule=false \ -Dplugin_uefi_capsule=false \
@ -231,8 +254,14 @@ can be flashed using flashrom. It is probably not required on servers.
%else %else
-Dplugin_modem_manager=false \ -Dplugin_modem_manager=false \
%endif %endif
-Dplugin_logitech_bulkcontroller=false \
-Dman=true \ -Dman=true \
-Dbluez=false \ -Dbluez=false \
-Dplugin_cfu=false \
-Dplugin_mtd=false \
-Dplugin_powerd=false \
-Dplugin_uf2=false \
-Dplugin_gpio=false \
-Dsupported_build=true -Dsupported_build=true
%meson_build %meson_build
@ -245,19 +274,17 @@ can be flashed using flashrom. It is probably not required on servers.
%install %install
%meson_install %meson_install
# on RHEL the LVFS is disabled by default
mkdir -p %{buildroot}/%{_datadir}/dbxtool
install %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{buildroot}/%{_datadir}/dbxtool
# sign fwupd.efi loader # sign fwupd.efi loader
%if 0%{?have_uefi}
%ifarch x86_64 %ifarch x86_64
%global efiarch x64 %global efiarch x64
%endif
%ifarch aarch64
%global efiarch aa64
%endif
%global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi
%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp %pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp -a %{SOURCE300} -c %{SOURCE301} -n redhatsecureboot301
%define __pesign_client_cert fwupd-signer %pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -a %{SOURCE500} -c %{SOURCE503} -n redhatsecureboot503
%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed rm -fv %{fwup_efi_fn}.tmp
rm -vf %{fwup_efi_fn}.tmp
%endif %endif
mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
@ -288,7 +315,6 @@ done
%doc README.md AUTHORS %doc README.md AUTHORS
%license COPYING %license COPYING
%config(noreplace)%{_sysconfdir}/fwupd/daemon.conf %config(noreplace)%{_sysconfdir}/fwupd/daemon.conf
%config(noreplace)%{_sysconfdir}/fwupd/upower.conf
%if 0%{?have_uefi} %if 0%{?have_uefi}
%config(noreplace)%{_sysconfdir}/fwupd/uefi_capsule.conf %config(noreplace)%{_sysconfdir}/fwupd/uefi_capsule.conf
%endif %endif
@ -302,9 +328,10 @@ done
%{_libexecdir}/fwupd/fwupdoffline %{_libexecdir}/fwupd/fwupdoffline
%if 0%{?have_uefi} %if 0%{?have_uefi}
%{_libexecdir}/fwupd/efi/*.efi %{_libexecdir}/fwupd/efi/*.efi
%ifarch x86_64
%{_libexecdir}/fwupd/efi/*.efi.signed %{_libexecdir}/fwupd/efi/*.efi.signed
%endif
%{_bindir}/fwupdate %{_bindir}/fwupdate
%{_bindir}/fwupdtpmevlog
%endif %endif
%{_bindir}/dfu-tool %{_bindir}/dfu-tool
%if 0%{?have_uefi} %if 0%{?have_uefi}
@ -326,6 +353,7 @@ done
%{_sysconfdir}/pki/fwupd-metadata %{_sysconfdir}/pki/fwupd-metadata
%if 0%{?have_msr} %if 0%{?have_msr}
/usr/lib/modules-load.d/fwupd-msr.conf /usr/lib/modules-load.d/fwupd-msr.conf
%config(noreplace)%{_sysconfdir}/fwupd/msr.conf
%endif %endif
%{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf %{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf
%{_datadir}/bash-completion/completions/fwupdmgr %{_datadir}/bash-completion/completions/fwupdmgr
@ -341,6 +369,13 @@ done
%{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
%{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules %{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
%{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service %{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service
%dir %{_datadir}/dbxtool
%{_datadir}/dbxtool/DBXUpdate-20100307-x64.cab
%{_datadir}/dbxtool/DBXUpdate-20140413-x64.cab
%{_datadir}/dbxtool/DBXUpdate-20160809-x64.cab
%{_datadir}/dbxtool/DBXUpdate-20200729-aa64.cab
%{_datadir}/dbxtool/DBXUpdate-20200729-ia32.cab
%{_datadir}/dbxtool/DBXUpdate-20200729-x64.cab
%{_mandir}/man1/fwupdtool.1* %{_mandir}/man1/fwupdtool.1*
%{_mandir}/man1/fwupdagent.1* %{_mandir}/man1/fwupdagent.1*
%{_mandir}/man1/dfu-tool.1* %{_mandir}/man1/dfu-tool.1*
@ -350,7 +385,6 @@ done
%{_mandir}/man1/fwupdmgr.1* %{_mandir}/man1/fwupdmgr.1*
%if 0%{?have_uefi} %if 0%{?have_uefi}
%{_mandir}/man1/fwupdate.1* %{_mandir}/man1/fwupdate.1*
%{_mandir}/man1/fwupdtpmevlog.1*
%endif %endif
%{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml
%{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg %{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg
@ -368,96 +402,110 @@ done
%dir %{_localstatedir}/cache/fwupd %dir %{_localstatedir}/cache/fwupd
%dir %{_datadir}/fwupd/quirks.d %dir %{_datadir}/fwupd/quirks.d
%{_datadir}/fwupd/quirks.d/*.quirk %{_datadir}/fwupd/quirks.d/*.quirk
%{_localstatedir}/lib/fwupd/builder/README.md %{_datadir}/doc/fwupd/builder/README.md
%{_libdir}/libfwupd*.so.* %if 0%{?have_uefi}
%{_sysconfdir}/grub.d/35_fwupd
%endif
%{_libdir}/libfwupd.so.2*
%{_libdir}/libfwupdplugin.so.%{fwupdplugin_version}*
%{_libdir}/girepository-1.0/Fwupd-2.0.typelib %{_libdir}/girepository-1.0/Fwupd-2.0.typelib
%{_libdir}/girepository-1.0/FwupdPlugin-1.0.typelib %{_libdir}/girepository-1.0/FwupdPlugin-1.0.typelib
/usr/lib/udev/rules.d/*.rules /usr/lib/udev/rules.d/*.rules
/usr/lib/systemd/system-shutdown/fwupd.shutdown /usr/lib/systemd/system-shutdown/fwupd.shutdown
%dir %{_libdir}/fwupd-plugins-3 %dir %{_libdir}/fwupd-plugins-%{fwupdplugin_version}
%{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_dmar.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_dmar.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_facp.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_facp.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_altos.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_acpi_phat.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_amt.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_amt.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_ata.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_analogix.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_bcm57xx.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ata.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_ccgx.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_bcm57xx.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_colorhug.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ccgx.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_cros_ec.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_colorhug.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_cpu.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cros_ec.so
%{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_cpu.so
%if 0%{?have_dell} %if 0%{?have_dell}
%{_libdir}/fwupd-plugins-3/libfu_plugin_dell.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_dell_esrt.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_esrt.so
%endif %endif
%{_libdir}/fwupd-plugins-3/libfu_plugin_dell_dock.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dell_dock.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_dfu.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_dfu_csr.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_dfu_csr.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_ebitdo.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ebitdo.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_elantp.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elantp.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_emmc.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_elanfp.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_ep963x.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_emmc.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_fastboot.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_ep963x.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_fresco_pd.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fastboot.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_hailuck.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_fresco_pd.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_iommu.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_genesys.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_jabra.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_hailuck.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_lockdown.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_iommu.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_linux_sleep.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_jabra.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
%if 0%{?have_uefi} %if 0%{?have_uefi}
%{_libdir}/fwupd-plugins-3/libfu_plugin_tpm.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_lenovo_thinklmi.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_tpm_eventlog.so
%{_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_pk.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_recovery.so
%endif %endif
%{_libdir}/fwupd-plugins-3/libfu_plugin_logind.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_lockdown.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_logitech_hidpp.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_sleep.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_upower.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_swap.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_vli.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_linux_tainted.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_raw.so %if 0%{?have_msr}
%{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_usb.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_msr.so
%{_libdir}/fwupd-plugins-3/libfu_plugin_goodixmoc.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_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_scsi.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_tpm.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_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 %ghost %{_localstatedir}/lib/fwupd/gnupg
%if 0%{?have_modem_manager} %if 0%{?have_modem_manager}
%files plugin-modem-manager %files plugin-modem-manager
%{_libdir}/fwupd-plugins-3/libfu_plugin_modem_manager.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_modem_manager.so
%endif %endif
%if 0%{?have_flashrom} %if 0%{?have_flashrom}
%files plugin-flashrom %files plugin-flashrom
%{_libdir}/fwupd-plugins-3/libfu_plugin_flashrom.so %{_libdir}/fwupd-plugins-%{fwupdplugin_version}/libfu_plugin_flashrom.so
%endif %endif
%if 0%{?have_uefi} %if 0%{?have_uefi}
%{_datadir}/fwupd/uefi-capsule-ux.tar.xz %{_datadir}/fwupd/uefi-capsule-ux.tar.xz
@ -472,23 +520,61 @@ done
%{_libdir}/libfwupd*.so %{_libdir}/libfwupd*.so
%{_libdir}/pkgconfig/fwupd.pc %{_libdir}/pkgconfig/fwupd.pc
%{_libdir}/pkgconfig/fwupdplugin.pc %{_libdir}/pkgconfig/fwupdplugin.pc
%if 0%{?have_uefi}
%{_libdir}/pkgconfig/fwupd-efi.pc
%endif
%files tests %files tests
%if 0%{?enable_tests} %if 0%{?enable_tests}
%dir %{_datadir}/installed-tests/fwupd %dir %{_datadir}/installed-tests/fwupd
%{_datadir}/installed-tests/fwupd/tests/*
%{_datadir}/installed-tests/fwupd/fwupd-tests.xml %{_datadir}/installed-tests/fwupd/fwupd-tests.xml
%{_datadir}/installed-tests/fwupd/*.test %{_datadir}/installed-tests/fwupd/*.test
%{_datadir}/installed-tests/fwupd/*.cab %{_datadir}/installed-tests/fwupd/*.cab
%{_datadir}/installed-tests/fwupd/*.sh %{_datadir}/installed-tests/fwupd/*.sh
%if 0%{?have_uefi}
%{_datadir}/installed-tests/fwupd/efi
%endif
%{_datadir}/fwupd/device-tests/*.json
%{_libexecdir}/installed-tests/fwupd/* %{_libexecdir}/installed-tests/fwupd/*
%dir %{_sysconfdir}/fwupd/remotes.d %dir %{_sysconfdir}/fwupd/remotes.d
%config(noreplace)%{_sysconfdir}/fwupd/remotes.d/fwupd-tests.conf %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/fwupd-tests.conf
%endif %endif
%changelog %changelog
* Mon Jan 24 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1.5.9-3.alma * Fri Oct 14 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1.7.9-1.alma
- AlmaLinux changes - AlmaLinux changes
* Mon Jul 25 2022 Richard Hughes <richard@hughsie.com> 1.7.8-1
- New upstream release
- Resolves: rhbz#2059075
* Wed Apr 06 2022 Richard Hughes <richard@hughsie.com> 1.7.4-3
- Disable the Logitech bulkcontroller plugin to avoid adding a dep to protobuf-c
which lives in AppStream, not BaseOS.
- Use the efi_vendor variable from EFI-RPM
- Resolves: rhbz#2064904
* Thu Jan 13 2022 Richard Hughes <richard@hughsie.com> 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 <richard@hughsie.com> 1.7.1-1
- New upstream release
- Backport Fedora 34 changes
- Include support for Dell TBT4 Docking stations
- Resolves: rhbz#1974347
- Resolves: rhbz#1991426
* Fri Sep 24 2021 Richard Hughes <richard@hughsie.com> 1.5.9-4
- Rebuilt to use redhatsecureboot503 signatures
- Undo last Fedora sync to use the RHEL-specific patches
- Resolves: rhbz#2007520
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.9-3 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.9-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688