[packages/fwupd] - updated to 1.8.10

qboosh qboosh at pld-linux.org
Sat Apr 1 18:56:21 CEST 2023


commit efc4a6c8987503266de720d1b1dfbf1704a476de
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 1 18:58:49 2023 +0200

    - updated to 1.8.10

 fwupd.spec | 160 ++++++++++++-------------------------------------------------
 1 file changed, 30 insertions(+), 130 deletions(-)
---
diff --git a/fwupd.spec b/fwupd.spec
index 8fb051d..2e0c7dd 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -12,44 +12,34 @@
 Summary:	System daemon for installing device firmware
 Summary(pl.UTF-8):	Demon systemowy do instalowania firmware'u urządzeń
 Name:		fwupd
-Version:	1.8.1
+Version:	1.8.10
 Release:	1
 License:	LGPL v2.1+
 Group:		Applications/System
 Source0:	https://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	bf76925cb36c8da4c1c626cdabb53799
+# Source0-md5:	bf6b6486f79732656980ba17a2087362
 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}
 # pkgconfig(libelf); can be also libelf-devel
-BuildRequires:	elfutils-devel >= 0.166
-%{?with_fontconfig:BuildRequires:	fontconfig-devel}
-%{?with_fontconfig:BuildRequires:	freetype-devel >= 2}
 BuildRequires:	gcab-devel >= 1.0
-# C99
-BuildRequires:	gcc >= 5:3.2
+# C11
+BuildRequires:	gcc >= 6:4.7
 %ifarch x32
-BuildRequires:	gcc-multilib-64 >= 5:3.2
+BuildRequires:	gcc-multilib-64 >= 6:4.7
 %endif
 BuildRequires:	gettext-tools >= 0.19.7
 BuildRequires:	glib2-devel >= 1:2.55.0
-%{?with_efi:BuildRequires:	gnu-efi}
 BuildRequires:	gnutls-devel >= 3.6.0
 BuildRequires:	gobject-introspection-devel >= 0.9.8
-BuildRequires:	gpgme-devel
-# or gi-docgen >= 2021.1 with -Ddocs=docgen
-%{?with_doc:BuildRequires:	gtk-doc >= 1.14}
-BuildRequires:	intltool >= 0.35.0
+%{?with_doc:BuildRequires:	gi-docgen >= 2022.2}
 BuildRequires:	json-glib-devel >= 1.1.1
 BuildRequires:	libarchive-devel
 BuildRequires:	libcbor-devel >= 0.7.0
 %{?with_flashrom:BuildRequires:	libflashrom-devel >= 1.2}
-BuildRequires:	libgpg-error-devel
 BuildRequires:	libgudev-devel >= 232
 BuildRequires:	libgusb-devel >= 0.3.5
 BuildRequires:	libjcat-devel >= 0.1.4
@@ -59,11 +49,10 @@ BuildRequires:	libjcat-devel >= 0.1.4
 %{?with_efi:BuildRequires:	libsmbios-devel >= 2.4.0}
 BuildRequires:	libsoup-devel >= 2.52
 BuildRequires:	libuuid-devel
-BuildRequires:	libxmlb-devel >= 0.1.13
-BuildRequires:	libxslt-progs
+BuildRequires:	libxmlb-devel >= 0.1.15
 # for <linux/nvme_ioctl.h>
 BuildRequires:	linux-libc-headers >= 7:4.4
-BuildRequires:	meson >= 0.60.0
+BuildRequires:	meson >= 0.61.0
 BuildRequires:	ninja >= 1.6
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.114
@@ -73,6 +62,7 @@ BuildRequires:	python3-pycairo
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	sqlite3-devel >= 3
+BuildRequires:	systemd-devel >= 1:209
 BuildRequires:	systemd-units >= 1:211
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	tpm2-tss-devel >= 2.0
@@ -93,7 +83,7 @@ Requires:	libjcat >= 0.1.4
 %{?with_modemmanager:Requires:	libqmi >= 1.23.1}
 %{?with_efi:Requires:	libsmbios >= 2.4.0}
 Requires:	libsoup >= 2.52
-Requires:	libxmlb >= 0.1.7
+Requires:	libxmlb >= 0.1.15
 Requires:	polkit >= 0.114
 Requires:	tpm2-tss >= 2.0
 %if %{with efi}
@@ -101,7 +91,7 @@ Suggests:	fwupd-efi
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		fwupd_plugins_dir	%{_libdir}/fwupd-plugins-6
+%define		fwupd_plugins_dir	%{_libdir}/fwupd-%{version}
 
 %description
 fwupd is a simple daemon to allow session software to update device
@@ -211,16 +201,15 @@ API języka Vala do biblioteki fwupd.
 %meson build \
 	-Dbluez=enabled \
 	-Defi_binary=false \
-	-Ddocs=%{?with_apidocs:gtkdoc}%{!?with_apidocs:none} \
+	-Ddocs=%{?with_apidocs:enabled} \
 	-Dlzma=enabled \
 	%{!?with_efi:-Dplugin_dell=disabled} \
-	%{?with_flashrom:-Dplugin_flashrom=enabled} \
+	%{!?with_flashrom:-Dplugin_flashrom=disabled} \
 	-Dplugin_intel_spi=true \
-	%{?with_modemmanager:-Dplugin_modem_manager=enabled} \
-	-Dplugin_platform_integrity=true \
+	%{!?with_modemmanager:-Dplugin_modem_manager=disabled} \
 	%{!?with_efi:-Dplugin_redfish=disabled} \
-	%{!?with_thunderbolt:-Dplugin_thunderbolt=disabled} \
 	%{!?with_efi:-Dplugin_uefi_capsule=disabled} \
+	%{!?with_efi:-Dplugin_uefi_pk=disabled} \
 	-Dtests=false
 
 %meson_build -C build
@@ -235,6 +224,12 @@ for pdoc in plugins/*/README.md ; do
 	cp -p plugins/${pname}/README.md README-${pname}.md
 done
 
+%if %{with apidocs}
+# FIXME: where to package gi-docgen generated docs?
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/*fwupd* $RPM_BUILD_ROOT%{_gtkdocdir}
+%endif
+
 %find_lang %{name}
 
 %clean
@@ -256,107 +251,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/fwupd/fwupd
 %attr(755,root,root) %{_libexecdir}/fwupd/fwupd-detect-cet
 %attr(755,root,root) %{_libexecdir}/fwupd/fwupdoffline
-%dir %{fwupd_plugins_dir}
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_acpi_dmar.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_acpi_facp.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_acpi_ivrs.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_acpi_phat.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_analogix.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_amt.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_ata.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_bcm57xx.so
-%if %{with efi}
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_bios.so
-%endif
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_ccgx.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_cfu.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_ch341a.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_colorhug.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_corsair.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_cpu.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_cros_ec.so
-%if %{with efi}
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_dell.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_dell_esrt.so
-%endif
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_dell_dock.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_dfu.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_dfu_csr.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_ebitdo.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_elanfp.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_elantp.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_emmc.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_ep963x.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_fastboot.so
 %if %{with flashrom}
 %attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_flashrom.so
 %endif
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_fresco_pd.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_genesys.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_goodixmoc.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_gpio.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_hailuck.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_intel_spi.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_iommu.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_jabra.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_lenovo_thinklmi.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_linux_lockdown.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_linux_sleep.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_linux_swap.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_linux_tainted.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_logind.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_logitech_bulkcontroller.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_logitech_hidpp.so
 %if %{with modemmanager}
 %attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_modem_manager.so
 %endif
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_msr.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_mtd.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_nitrokey.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_nordic_hid.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_nvme.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_optionrom.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_parade_lspcon.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_pci_bcr.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_pci_mei.so
-%ifarch %{x8664} x32
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_pci_psp.so
-%endif
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_pixart_rf.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_platform_integrity.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_powerd.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_realtek_mst.so
-%if %{with efi}
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_redfish.so
-%endif
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_rts54hid.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_rts54hub.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_scsi.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_steelseries.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_superio.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_synaptics_cape.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_synaptics_cxaudio.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_synaptics_mst.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_synaptics_prometheus.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_synaptics_rmi.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_system76_launch.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_thelio_io.so
-%if %{with thunderbolt}
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_thunderbolt.so
-%endif
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_tpm.so
-%if %{with efi}
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_uefi_capsule.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_uefi_dbx.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_uefi_pk.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_uefi_recovery.so
-%endif
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_uf2.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_upower.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_usi_dock.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_vli.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_wacom_raw.so
-%attr(755,root,root) %{fwupd_plugins_dir}/libfu_plugin_wacom_usb.so
 %dir %{_sysconfdir}/fwupd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/daemon.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fwupd/msr.conf
@@ -383,8 +283,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service
 %{_sysconfdir}/pki/fwupd-metadata/LVFS-CA.pem
 #/lib/modules-load.d/fwupd-msr.conf
-#/lib/modules-load.d/fwupd-platform-integrity.conf
-#/lib/modules-load.d/fwupd-redfish.conf
 %{systemdunitdir}/fwupd.service
 %{systemdunitdir}/fwupd-offline-update.service
 %{systemdunitdir}/fwupd-refresh.service
@@ -437,32 +335,34 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfwupd.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfwupd.so.2
-%attr(755,root,root) %{_libdir}/libfwupdplugin.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfwupdplugin.so.6
 %{_libdir}/girepository-1.0/Fwupd-2.0.typelib
-%{_libdir}/girepository-1.0/FwupdPlugin-1.0.typelib
+%dir %{fwupd_plugins_dir}
+%attr(755,root,root) %{fwupd_plugins_dir}/libfwupdengine.so
+%attr(755,root,root) %{fwupd_plugins_dir}/libfwupdplugin.so
+%attr(755,root,root) %{fwupd_plugins_dir}/libfwupdutil.so
 
 %files devel
 %defattr(644,root,root,755)
 %doc libfwupd/README.md
 %attr(755,root,root) %{_libdir}/libfwupd.so
-%attr(755,root,root) %{_libdir}/libfwupdplugin.so
 %{_includedir}/fwupd-1
 %{_datadir}/gir-1.0/Fwupd-2.0.gir
-%{_datadir}/gir-1.0/FwupdPlugin-1.0.gir
 %{_datadir}/dbus-1/interfaces/org.freedesktop.fwupd.xml
 %{_pkgconfigdir}/fwupd.pc
-%{_pkgconfigdir}/fwupdplugin.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfwupd.a
-%{_libdir}/libfwupdplugin.a
+%{fwupd_plugins_dir}/libfwupdengine.a
+%{fwupd_plugins_dir}/libfwupdplugin.a
+%{fwupd_plugins_dir}/libfwupdutil.a
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/fwupd
+%{_gtkdocdir}/libfwupd
+%{_gtkdocdir}/libfwupdplugin
 %endif
 
 %files -n vala-fwupd
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fwupd.git/commitdiff/efc4a6c8987503266de720d1b1dfbf1704a476de



More information about the pld-cvs-commit mailing list