diff --git a/.gitignore b/.gitignore index fe2e399..3156822 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ /fwupd-1.9.10.tar.xz /fwupd-1.9.11.tar.xz /fwupd-1.9.12.tar.xz +/fwupd-1.9.13.tar.xz diff --git a/0001-Do-not-check-jcat.pc-for-supported-engines.patch b/0001-Do-not-check-jcat.pc-for-supported-engines.patch deleted file mode 100644 index 2e5b9f7..0000000 --- a/0001-Do-not-check-jcat.pc-for-supported-engines.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e887e1fd8a94fa0c65c7941acd5dfde6f6f8791c Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 4 Dec 2023 12:02:09 +0000 -Subject: [PATCH] Do not check jcat.pc for supported engines - ---- - data/pki/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/pki/meson.build b/data/pki/meson.build -index 58719cb7e..44e9840dd 100644 ---- a/data/pki/meson.build -+++ b/data/pki/meson.build -@@ -1,6 +1,6 @@ - # only install files that are going to be used --supported_gpg = libjcat.get_variable(pkgconfig: 'supported_gpg', default_value: '0') == '1' --supported_pkcs7 = libjcat.get_variable(pkgconfig: 'supported_pkcs7', default_value: '0') == '1' or host_machine.system() == 'windows' -+supported_gpg = true -+supported_pkcs7 = true - - if supported_gpg - install_data([ --- -2.43.0 - diff --git a/fwupd.spec b/fwupd.spec index c81ec4a..ab91786 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -48,7 +48,7 @@ Summary: Firmware update daemon Name: fwupd -Version: 1.9.12 +Version: 1.9.13 Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/fwupd/fwupd @@ -56,7 +56,6 @@ Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}. Source2: http://people.freedesktop.org/~hughsient/releases/fwupd-efi-1.4.tar.xz Patch101: 0001-generate_binary-Add-NX-COMPAT-flag-manually-when-gen.patch -Patch102: 0001-Do-not-check-jcat.pc-for-supported-engines.patch Source10: http://people.redhat.com/rhughes/dbx/DBXUpdate-20100307-x64.cab Source11: http://people.redhat.com/rhughes/dbx/DBXUpdate-20140413-x64.cab @@ -196,7 +195,6 @@ can be flashed using flashrom. It is probably not required on servers. %prep %setup -q -%patch102 -p1 mkdir -p subprojects/fwupd-efi tar xfvs %{SOURCE2} -C subprojects/fwupd-efi --strip-components=1 @@ -348,7 +346,6 @@ done %dir %{_sysconfdir}/fwupd/remotes.d %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/lvfs.conf %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/lvfs-testing.conf -%config(noreplace)%{_sysconfdir}/fwupd/remotes.d/vendor.conf %config(noreplace)%{_sysconfdir}/fwupd/remotes.d/vendor-directory.conf %config(noreplace)%{_sysconfdir}/pki/fwupd %{_sysconfdir}/pki/fwupd-metadata @@ -450,10 +447,14 @@ done %{_datadir}/installed-tests/fwupd/sys_vendor %{_libexecdir}/installed-tests/fwupd/* %dir %{_sysconfdir}/fwupd/remotes.d -%config(noreplace)%{_sysconfdir}/fwupd/remotes.d/fwupd-tests.conf +%{_datadir}/fwupd/remotes.d/fwupd-tests.conf %endif %changelog +* Thu Feb 15 2024 Richard Hughes 1.9.13-1 +- Update to latest stable upstream version. +- Resolves: #RHEL-15328 + * Wed Jan 24 2024 Richard Hughes 1.9.12-1 - Update to latest stable upstream version. - Resolves: #RHEL-15328 diff --git a/sources b/sources index 71599db..de52e6d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (fwupd-1.9.12.tar.xz) = d0b2db6fb9dc231022b8109e0c62b682173a89755e759972f6e4b33fa9a8c31426b3bef3fab9b931ef591adcc867962e8251632223e5460122ea499df636b214 +SHA512 (fwupd-1.9.13.tar.xz) = 240e057e33e861a84638866a43a7cae33bc3f12d48d5cf2ad3f8bdfb92824057472d1981ac2145d2024f31727f8413c555ce907dea28f4f7232e4604e24703ab SHA512 (fwupd-efi-1.4.tar.xz) = c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991 SHA512 (DBXUpdate-20100307-x64.cab) = f8ad56cf015f4cdc5c305856ff1f7a8589c25a2a671708c61883f427f38eb9b6a7abd3f2c8d79ef9d5076222255e42585917f8705a2a4b13f860bad4e02ec409 SHA512 (DBXUpdate-20140413-x64.cab) = 75771876a2309fa8ca083c2e76520173d434229b7cacf1e7636bd9b1bc4f871d745c348b9792bfb65fd9f40ef54c25bb427b1431151e817e7050b7829456731a