[packages/fwupd] - updated to 1.6.0 - dropped bashcomp patch, BR bash-completion-devel instead - switched to libflash
qboosh
qboosh at pld-linux.org
Tue Jun 15 19:29:43 CEST 2021
commit 6c954d9b538248acc8fd5e1418547096508ae370
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Jun 15 19:32:37 2021 +0200
- updated to 1.6.0
- dropped bashcomp patch, BR bash-completion-devel instead
- switched to libflashrom 1.2, removed obsolete flashrom patch
fwupd-bashcomp.patch | 23 ----------
fwupd-flashrom.patch | 11 -----
fwupd.spec | 123 ++++++++++++++++++++++++++++++---------------------
3 files changed, 72 insertions(+), 85 deletions(-)
---
diff --git a/fwupd.spec b/fwupd.spec
index cebe4ec..db74f96 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -12,17 +12,17 @@
Summary: System daemon for installing device firmware
Summary(pl.UTF-8): Demon systemowy do instalowania firmware'u urządzeń
Name: fwupd
-Version: 1.4.6
-Release: 2
+Version: 1.6.0
+Release: 1
License: LGPL v2.1+
Group: Applications/System
Source0: https://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 2e5ae3c97c955cc0cb7d1c53323279e5
-Patch0: %{name}-bashcomp.patch
-Patch1: %{name}-flashrom.patch
+# Source0-md5: 0817e0fe6b52e328bb08575acd9a6251
URL: https://github.com/hughsie/fwupd
%{?with_modemmanager:BuildRequires: ModemManager-devel >= 1.10.0}
+BuildRequires: bash-completion-devel >= 2.0
%{?with_cairo:BuildRequires: cairo-devel}
+BuildRequires: curl-devel >= 7.62.0
BuildRequires: docbook-dtd41-sgml
BuildRequires: docbook-utils
%{?with_efi:BuildRequires: efivar-devel >= 33}
@@ -46,10 +46,10 @@ BuildRequires: gpgme-devel
BuildRequires: intltool >= 0.35.0
BuildRequires: json-glib-devel >= 1.1.1
BuildRequires: libarchive-devel
-%{?with_flashrom:BuildRequires: libflashrom-devel}
+%{?with_flashrom:BuildRequires: libflashrom-devel >= 1.2}
BuildRequires: libgpg-error-devel
BuildRequires: libgudev-devel >= 232
-BuildRequires: libgusb-devel >= 0.2.9
+BuildRequires: libgusb-devel >= 0.3.5
BuildRequires: libjcat-devel >= 0.1.0
%{?with_modemmanager:BuildRequires: libqmi-devel >= 1.22.0}
# for dell (which requires also uefi plugin and efivar)
@@ -67,7 +67,8 @@ BuildRequires: polkit-devel >= 0.114
BuildRequires: python3 >= 1:3.0
BuildRequires: python3-pillow
BuildRequires: python3-pycairo
-BuildRequires: rpmbuild(macros) >= 1.726
+BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: sqlite3-devel >= 3
BuildRequires: systemd-units >= 1:211
BuildRequires: tar >= 1:1.22
@@ -75,12 +76,14 @@ BuildRequires: tpm2-tss-devel >= 2.0
BuildRequires: udev-devel
%{?with_thunderbolt:BuildRequires: umockdev-devel}
BuildRequires: xz
+BuildRequires: xz-devel
Requires: %{name}-libs = %{version}-%{release}
%{?with_modemmanager:BuildRequires: ModemManager-libs >= 1.10.0}
+Requires: curl-libs >= 7.62.0
Requires: gcab >= 1.0
Requires: gnutls-libs >= 3.6.0
Requires: libgudev >= 232
-Requires: libgusb >= 0.2.9
+Requires: libgusb >= 0.3.5
Requires: libjcat >= 0.1.0
%{?with_modemmanager:Requires: libqmi >= 1.22.0}
%{?with_efi:Requires: libsmbios >= 2.4.0}
@@ -88,6 +91,9 @@ Requires: libsoup >= 2.52
Requires: libxmlb >= 0.1.7
Requires: polkit >= 0.114
Requires: tpm2-tss >= 2.0
+%if %{with efi}
+Suggests: fwupd-efi
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -147,7 +153,6 @@ Summary(pl.UTF-8): Pliki nagłówkowe bibliotek fwupd
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: glib2-devel >= 1:2.55.0
-Obsoletes: fwupd-static
%description devel
Header files for fwupd libraries.
@@ -155,6 +160,18 @@ Header files for fwupd libraries.
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek fwupd.
+%package static
+Summary: Static fwupd libraries
+Summary(pl.UTF-8): Statyczne biblioteki fwupd
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static fwupd libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki fwupd.
+
%package apidocs
Summary: API documentation for fwupd libraries
Summary(pl.UTF-8): Dokumentacja API do bibliotek fwupd
@@ -182,8 +199,6 @@ API języka Vala do biblioteki fwupd.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%ifarch x32
# -m64 is needed to build x64 EFI
@@ -193,13 +208,16 @@ API języka Vala do biblioteki fwupd.
%build
%meson build \
-Dbash_completiondir=%{bash_compdir} \
+ -Defi_binary=false \
-Dgtkdoc=%{__true_false apidocs} \
+ -Dlzma=true \
%{!?with_efi:-Dplugin_dell=false} \
%{?with_flashrom:-Dplugin_flashrom=true} \
+ -Dplugin_intel_spi=true \
%{?with_modemmanager:-Dplugin_modem_manager=true} \
%{!?with_efi:-Dplugin_redfish=false} \
%{!?with_thunderbolt:-Dplugin_thunderbolt=false} \
- %{!?with_efi:-Dplugin_uefi=false} \
+ %{!?with_efi:-Dplugin_uefi_capsule=false} \
-Dtests=false
%meson_build -C build
@@ -224,7 +242,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS MAINTAINERS README.md README-*.md
+%doc AUTHORS MAINTAINERS README.md README-*.md SECURITY.md
%{?with_efi:%attr(755,root,root) %{_bindir}/dbxtool}
%attr(755,root,root) %{_bindir}/dfu-tool
%attr(755,root,root) %{_bindir}/fwupdagent
@@ -234,27 +252,32 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/fwupdtpmevlog
%dir %{_libexecdir}/fwupd
%attr(755,root,root) %{_libexecdir}/fwupd/fwupd
+%attr(755,root,root) %{_libexecdir}/fwupd/fwupd-detect-cet
%attr(755,root,root) %{_libexecdir}/fwupd/fwupdoffline
-%if %{with efi}
-%dir %{_libexecdir}/fwupd/efi
-%{_libexecdir}/fwupd/efi/fwupd*.efi
-%endif
%dir %{_libdir}/fwupd-plugins-3
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_dmar.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_acpi_facp.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_altos.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_analogix.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_amt.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_ata.so
-%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_colorhug.so
-%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_coreboot.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_bcm57xx.so
+%if %{with efi}
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_bios.so
+%endif
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_ccgx.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_colorhug.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_cpu.so
-%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_csr.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_cros_ec.so
%if %{with efi}
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_dell.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_dell_esrt.so
%endif
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_dell_dock.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_dfu.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_dfu_csr.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_ebitdo.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_elantp.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_emmc.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_ep963x.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_fastboot.so
@@ -262,15 +285,27 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_flashrom.so
%endif
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_fresco_pd.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_goodixmoc.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_hailuck.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_intel_spi.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_iommu.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_jabra.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_linux_lockdown.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_linux_sleep.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_linux_swap.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_linux_tainted.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_logind.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_logitech_hidpp.so
%if %{with modemmanager}
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_modem_manager.so
%endif
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_msr.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_nitrokey.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_nvme.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_optionrom.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_pci_bcr.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_pci_mei.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_pixart_rf.so
%if %{with efi}
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_redfish.so
%endif
@@ -283,6 +318,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_mst.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_prometheus.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_synaptics_rmi.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_system76_launch.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_thelio_io.so
%if %{with thunderbolt}
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt.so
@@ -290,8 +326,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_tpm.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_tpm_eventlog.so
%if %{with efi}
-%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_uefi.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_capsule.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_dbx.so
+%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_pk.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_uefi_recovery.so
%endif
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_upower.so
@@ -299,13 +336,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_raw.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_wacom_usb.so
%dir %{_sysconfdir}/fwupd
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/ata.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/daemon.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/thunderbolt.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/upower.conf
%if %{with efi}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/redfish.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/uefi.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/uefi_capsule.conf
%endif
%dir %{_sysconfdir}/fwupd/remotes.d
%if %{with efi}
@@ -317,7 +353,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/vendor.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/remotes.d/vendor-directory.conf
%dir %{_sysconfdir}/pki/fwupd
-%{_sysconfdir}/pki/fwupd/GPG-KEY-Hughski-Limited
+#%{_sysconfdir}/pki/fwupd/GPG-KEY-Hughski-Limited
%{_sysconfdir}/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware
%{_sysconfdir}/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service
%{_sysconfdir}/pki/fwupd/LVFS-CA.pem
@@ -330,6 +366,7 @@ rm -rf $RPM_BUILD_ROOT
%{systemdunitdir}/fwupd-refresh.service
%{systemdunitdir}/fwupd-refresh.timer
%{systemdunitdir}/system-update.target.wants/fwupd-offline-update.service
+#/lib/modules-load.d/fwupd-msr.conf
/lib/systemd/system-preset/fwupd-refresh.preset
/lib/systemd/system-shutdown/fwupd.shutdown
/lib/udev/rules.d/90-fwupd-devices.rules
@@ -340,6 +377,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_datadir}/fwupd/firmware_packager.py
%attr(755,root,root) %{_datadir}/fwupd/install_dell_bios_exe.py
%attr(755,root,root) %{_datadir}/fwupd/simple_client.py
+%if %{with efi}
+%{_datadir}/fwupd/uefi-capsule-ux.tar.xz
+%endif
%{_datadir}/fwupd/quirks.d
%dir %{_datadir}/fwupd/remotes.d
%if %{with efi}
@@ -353,30 +393,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
%{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
%{_iconsdir}/hicolor/scalable/apps/org.freedesktop.fwupd.svg
-%if %{with efi}
-%lang(ca) %{_localedir}/ca/LC_IMAGES
-%lang(cs) %{_localedir}/cs/LC_IMAGES
-%lang(da) %{_localedir}/da/LC_IMAGES
-%lang(de) %{_localedir}/de/LC_IMAGES
-%lang(en) %{_localedir}/en/LC_IMAGES
-%lang(fi) %{_localedir}/fi/LC_IMAGES
-%lang(fur) %{_localedir}/fur/LC_IMAGES
-%lang(hr) %{_localedir}/hr/LC_IMAGES
-%lang(hu) %{_localedir}/hu/LC_IMAGES
-%lang(id) %{_localedir}/id/LC_IMAGES
-%lang(it) %{_localedir}/it/LC_IMAGES
-%lang(ko) %{_localedir}/ko/LC_IMAGES
-%lang(lt) %{_localedir}/lt/LC_IMAGES
-%lang(pl) %{_localedir}/pl/LC_IMAGES
-%lang(pt_BR) %{_localedir}/pt_BR/LC_IMAGES
-%lang(ru) %{_localedir}/ru/LC_IMAGES
-%lang(sr) %{_localedir}/sr/LC_IMAGES
-%lang(sv) %{_localedir}/sv/LC_IMAGES
-%lang(tr) %{_localedir}/tr/LC_IMAGES
-%lang(uk) %{_localedir}/uk/LC_IMAGES
-%lang(zh_CN) %{_localedir}/zh_CN/LC_IMAGES
-%lang(zh_TW) %{_localedir}/zh_TW/LC_IMAGES
-%endif
%dir /var/lib/fwupd
%dir /var/lib/fwupd/builder
/var/lib/fwupd/builder/README.md
@@ -401,9 +417,9 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libfwupd.so.*.*.*
-%attr(755,root,root) %{_libdir}/libfwupdplugin.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libfwupd.so.2
-%attr(755,root,root) %ghost %{_libdir}/libfwupdplugin.so.1
+%attr(755,root,root) %{_libdir}/libfwupdplugin.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfwupdplugin.so.2
%{_libdir}/girepository-1.0/Fwupd-2.0.typelib
%{_libdir}/girepository-1.0/FwupdPlugin-1.0.typelib
@@ -419,6 +435,11 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/fwupd.pc
%{_pkgconfigdir}/fwupdplugin.pc
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libfwupd.a
+%{_libdir}/libfwupdplugin.a
+
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
diff --git a/fwupd-bashcomp.patch b/fwupd-bashcomp.patch
deleted file mode 100644
index 42f5626..0000000
--- a/fwupd-bashcomp.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- fwupd-1.2.10/meson_options.txt.orig 2019-09-13 06:06:30.006025055 +0200
-+++ fwupd-1.2.10/meson_options.txt 2019-09-13 15:48:25.670204020 +0200
-@@ -30,3 +30,4 @@
- option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory')
- option('efi-includedir', type : 'string', value : '/usr/include/efi', description : 'path to the EFI header directory')
- option('efi_os_dir', type: 'string', description : 'the name of OS directory in ESP')
-+option('bash_completiondir', type : 'string', value : '')
---- fwupd-1.4.4/data/bash-completion/meson.build.orig 2020-07-06 21:50:32.951174519 +0200
-+++ fwupd-1.4.4/data/bash-completion/meson.build 2020-07-06 22:18:15.335501944 +0200
-@@ -1,8 +1,12 @@
--if bashcomp.found()
-+completions_dir = get_option('bash_completiondir')
-+
-+if completions_dir == '' and bashcomp.found()
- completions_dir = bashcomp.get_pkgconfig_variable('completionsdir',
- define_variable: bashcomp.version().version_compare('>= 2.10') ? ['datadir', datadir] : ['prefix', prefix],
- )
-+endif
-
-+if completions_dir != ''
-
- if get_option('agent')
- install_data(['fwupdagent'],
diff --git a/fwupd-flashrom.patch b/fwupd-flashrom.patch
deleted file mode 100644
index 5bafcea..0000000
--- a/fwupd-flashrom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fwupd-1.3.7/meson.build~ 2020-01-31 14:14:56.000000000 +0100
-+++ fwupd-1.3.7/meson.build 2020-02-01 18:13:38.676646757 +0100
-@@ -352,7 +352,7 @@ if build_standalone and get_option('plug
- endif
-
- if build_standalone and get_option('plugin_flashrom')
-- libflashrom = dependency('flashrom', fallback : ['flashrom', 'flashrom_dep'])
-+ libflashrom = dependency('libflashrom', fallback : ['flashrom', 'flashrom_dep'])
- endif
-
- if build_standalone and get_option('systemd')
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fwupd.git/commitdiff/6c954d9b538248acc8fd5e1418547096508ae370
More information about the pld-cvs-commit
mailing list