diff --git a/_service b/_service index f7e0075..148f53b 100644 --- a/_service +++ b/_service @@ -1,9 +1,10 @@ + https://github.com/fwupd/fwupd.git git @PARENT_TAG@ - 1.7.10 + 1.8.6 diff --git a/fwupd-1.7.10.obscpio b/fwupd-1.7.10.obscpio deleted file mode 100644 index 4e8fced..0000000 --- a/fwupd-1.7.10.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7be57996be1bc3d4fcaf3fc5685455ed334b0e5a949bebfe551458962b551ffc -size 13832205 diff --git a/fwupd-1.8.6.obscpio b/fwupd-1.8.6.obscpio new file mode 100644 index 0000000..21cb761 --- /dev/null +++ b/fwupd-1.8.6.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50d59169ab7b5a884811f2cd1b3a3e197c9b07347c67748975a0c0686d15bc47 +size 15931917 diff --git a/fwupd-bsc1130056-change-shim-path.patch b/fwupd-bsc1130056-change-shim-path.patch index d428bc2..353bddb 100644 --- a/fwupd-bsc1130056-change-shim-path.patch +++ b/fwupd-bsc1130056-change-shim-path.patch @@ -1,9 +1,9 @@ -Index: fwupd-1.7.2/plugins/uefi-capsule/fu-uefi-bootmgr.c +Index: fwupd-1.8.5/plugins/uefi-capsule/fu-uefi-bootmgr.c =================================================================== ---- fwupd-1.7.2.orig/plugins/uefi-capsule/fu-uefi-bootmgr.c -+++ fwupd-1.7.2/plugins/uefi-capsule/fu-uefi-bootmgr.c -@@ -294,7 +294,8 @@ fu_uefi_bootmgr_bootnext(FuDevice *devic - secure_boot = fu_efivar_secure_boot_enabled(); +--- fwupd-1.8.5.orig/plugins/uefi-capsule/fu-uefi-bootmgr.c ++++ fwupd-1.8.5/plugins/uefi-capsule/fu-uefi-bootmgr.c +@@ -292,7 +292,8 @@ fu_uefi_bootmgr_bootnext(FuDevice *devic + secure_boot = fu_efivar_secure_boot_enabled(NULL); if (secure_boot) { /* test to make sure shim is there if we need it */ - shim_app = fu_uefi_get_esp_app_path(device, esp_path, "shim", error); diff --git a/fwupd-jscSLE-11766-close-efidir-leap-gap.patch b/fwupd-jscSLE-11766-close-efidir-leap-gap.patch index 9e3f90f..c3d7e69 100644 --- a/fwupd-jscSLE-11766-close-efidir-leap-gap.patch +++ b/fwupd-jscSLE-11766-close-efidir-leap-gap.patch @@ -1,8 +1,8 @@ -Index: fwupd-1.7.2/plugins/uefi-capsule/fu-uefi-common.c +Index: fwupd-1.8.5/plugins/uefi-capsule/fu-uefi-common.c =================================================================== ---- fwupd-1.7.2.orig/plugins/uefi-capsule/fu-uefi-common.c -+++ fwupd-1.7.2/plugins/uefi-capsule/fu-uefi-common.c -@@ -196,9 +196,13 @@ fu_uefi_get_esp_path_for_os(FuDevice *de +--- fwupd-1.8.5.orig/plugins/uefi-capsule/fu-uefi-common.c ++++ fwupd-1.8.5/plugins/uefi-capsule/fu-uefi-common.c +@@ -233,9 +233,13 @@ fu_uefi_get_esp_path_for_os(FuDevice *de g_autofree gchar *esp_path = NULL; g_autoptr(GError) error_local = NULL; g_autoptr(GHashTable) os_release = fwupd_get_os_release(&error_local); diff --git a/fwupd.changes b/fwupd.changes index 0015d35..b4b7a31 100644 --- a/fwupd.changes +++ b/fwupd.changes @@ -1,7 +1,296 @@ +------------------------------------------------------------------- +Fri Oct 14 08:57:52 UTC 2022 - Bjørn Lie + +- Update to version 1.8.6: + + This release adds the following features: + - Reduce the installed package size by more than 30% + - Translate more interactive messages + + This release fixes the following bugs: + - Allow disabling a DFU device when required + - Fix a regression when getting the i2c bus number + - Fix a small memory leak when reloading the parade-lspcon + device + - Fix installing the dbx update when using fwupdtool + - Improve writing CoSWID and uSWID metadata + - Only include the last 5 releases in the installed metainfo + file + - Only request the BOS descriptor for newer libgusb versions + - Prevent high memory usage when loading corrupt SREC files + - Try harder when trying to find the default ESP volume + - Use a higher compression preset for the UEFI splash images + + This release adds support for the following hardware: + - Focaltech touchpads + - FPC fingerprint readers + - Supermicro machines using Redfish +- Drop plugin_sover define, and sub-packages libfwupdplugin7 and + typelib-1_0-FwupdPlugin-1_0 following upstream changes. + +------------------------------------------------------------------- +Fri Sep 30 17:11:26 UTC 2022 - Bjørn Lie + +- Update to version 1.8.5: + + This release adds the following features: + - Add a new android-boot plugin to update specific block + devices + - Add new plugin to display SMU firmware version on AMD APU/CPU + - Add support for platform capability descriptors so devices + can set quirks + - Move the generic Intel Goshen Ridge code out to a new plugin + + This release fixes the following bugs: + - Allow specifying the ESP when applying the dbx update + - Always check the BDP partitions when getting all the possible + ESPs + - Correctly update Wacom AES devices + - Disable changing sleep mode on Ryzen 6000 systems + - Do not show the 'may not be usable while updating' message + for DBX updates + - Expose Pine64 PinePhone Pro MTD as Tow-Boot + - Fix a critical warning when issuing Secure Boot modem AT + commands + - Fix a fuzzing crash when parsing malicious FDT data + - Fix aligning up addresses greater than 4GB + - Fix a possible crash when dumping VBE firmware + - Fix a possible critical warning when parsing cabinet archives + - Fix a regression when parsing pixart-rf firmware + - Fix a small memory leak when parsing UF2 files + - Fix checking for invalid depth requirements + - Fix parsing the coSWID firmware ID when encoded as a UUID + - Fix parsing uSWID uncompressed metadata + - Fix uploading to DFU-CSR devices + - Limit the archive size to 25% of the RAM, or 4G + - Load coSWID metadata from a uSWID MTD block device + - Never save the Redfish auto-generated password to a + user-readable file + - Only create users using IPMI when we know it's going to work + - Write all the CCGX metadata block as intended + + This release adds support for the following hardware: + - Corsair SABRE RGB PRO Gaming mouse + - More Sonix CAM devices + - More Intel Goshen Ridge USB-4 docks +- Changes from version 1.8.4: + + This release adds the following features: + - Add a translated title and long description for HSI security + attributes + - Add support for loading a machine-default BIOS settings + policy + - Add support for reading and writing BIOS settings + - Allow loading BIOS settings for host emulation + - Prompt users to fix some BIOS configuration issues + + This release fixes the following bugs: + - Actually show provided AppStream security issues + - Add Quectel secure boot status AT commands + - Correctly detect CET IBT + - Do not assert when running with no plugins + - Do not require UEFI capsule updates for checking TPM PCR0 + - Do not show HSI events where we changed the spec result value + - Fix applying the latest DBX update + - Include vfat in the list of possible BDP partition types + - Install all devices with the same composite id in fwupdtool + - Only fail the kernel HSI test for specific taint reasons + - Only show changed events in fwupdmgr security + - Update vulnerable CMSE versions from CSMEVDT data + + This release adds support for the following hardware: + - Elan non-HID touchpads + - Google Prism + - LabTop Mk III + - ThinkPad Thunderbolt 4 Dock + - ThinkPad Universal Smart Dock +- Changes from version 1.8.3: + + This release adds the following features: + - Add resolution flags to each security attribute failures for + the user + - Allow loading in emulated host profiles for debugging + - Check if Intel TME has been disabled by the firmware or + platform + - Wait for the system to acquiesce after doing each update + + This release fixes the following bugs: + - Do not use CoD even when advertized on non-aarch64 platforms + - Fix a crash when updating the Logitech Bolt radio device + - Fix a critical warning when parsing an invalid PHAT record + - Fix a critical warning when parsing invalid FDT firmware + - Fix fwupdmgr security when plugins are added to the blocklist + - Fix parsing SMBIOS data to correct the device hardware IDs + - Fix uploading signed reports by sending the correct checksum + - Use the correct protocol attribute name when exporting to + JSON + + This release adds support for the following hardware: + - Additional Startech devices + - Additional Elan fingerprint readers +- Changes from version 1.8.2: + + This release adds the following features: + - Add startup profiling which allowed us to speed up daemon + startup considerably + - Add support for OptionROM, CPD and FPT firmware formats for + future hardware + - Add the HostVendor to the D-Bus interface + - Break some internal ABI and add a conversion helper for + out-of-tree plugins + - Optionally build the quirk files into the daemon binary to + reduce installed size + + This release fixes the following bugs: + - Allow front-end clients to read the percentage property + - Allow more quirk entries to add multiple items + - Allow to force install Genesys firmware even if the + public-key does not match + - Allow UFS disks to define the signed status in metadata + - Autoconnect the Redfish network device when rebooting the BMC + - Copy the instance ID strings when incorporating devices + - Do not generate a capsule header for the FMP GUID + - Ensure more firmware formats can round-trip to and from XML + - Fix a regression for devices using the Atmel FLIP Bootloader + - Fix running fwupdtool security with a user-specified plugin + allowlist + - Handle ENOTTY with the correct error code for ioctl calls + - Increase the self tests coverage substantially + - Modernize the AMT plugin and split out common MEI + functionality + - Only move the logitech-bulkcontroller progressbar forwards + when writing + - Set the device ID on the FwupdRequest to allow better UX + - Show the get-details output when the device requirements fail + - Simply quirk matching for i2c devices to speed up daemon + startup + - Support SHA256 fastboot hashes if specified + - Use force-detach to bypass the DFU streaming check for camera + devices + - Use the SCSI target to correctly set the physical ID + - Wait for the System76 launch device to re-enumerate if + already unlocked + + This release adds support for the following hardware: + - Corsair HARPOON RGB Wireless mouse + - U-Boot devices writing simple FIT images + - Genesys M27fd AIM101 + - More PixArt wireless devices + - More Steelseries HID, Sonic and Fizz devices + - System76 launch_2 +- Changes from version 1.8.1: + + This release adds the following features: + - Add archive writing support for devices with composite + firmware + - Add a way to read device composite firmware in fwupdtool + - Allow clients to opt-in to showing updates with user-solvable + problems + - Allow the device to pause polling when writing firmware + - Export the system and device battery levels on the D-Bus + interface + - Log errors and warnings to the win32 eventlog when required + - Add X-UsbReceiver as an update category with icon + usb-receiver + + This release fixes the following bugs: + - Accurately return the last-set status to client tools + - Allow dumping flashrom firmware using fwupdtool + - Allow specifying a non-file D-Bus transport + - Allow to request post actions from fwupdtool + - Always be arch-explicit when installing OS deps + - Be more resilient when restarting the Redfish BMC + - Do not mark all Redfish updates as UPDATABLE + - Do not use 'dongle' to describe USB receiver hardware + - Download in-process when using fwupdtool + - Fix a critical warning on failed modem update + - Fix regression when probing PS175 devices + - Hardcode the Redfish filedata name to firmware.bin + - Set the Bluetooth version if REV has been set + - Switch the Windows installer from NSIS to MSI + - Use StartServiceCtrlDispatcherA for the daemon on Windows + - Use the native certificate store on Windows + + This release adds support for the following hardware: + - Corsair KATAR PRO XT, SABRE PRO and KATAR PRO Wireless + - HP Thunderbolt Dock G4 + - Lenovo ThinkPad Universal USB-C Dock + - More PixArt wireless devices + - More SunplusIT USB cameras + - Some UFS devices + - Steelseries Aerox 3 Wireless and Rival 3 Wireless +- Changes from version 1.8.0: + + This release adds the following features: + - Add a new attribute for CPUs supported by HSI + - Add coSWID and uSWID parsers to libfwupdplugin for initial + SBoM support + - Add new HSI attributes for the AMD PSP and various other + system protections + - Add the runtime fwupd-efi version as a firmware requirement + - Allow 'fwupdmgr install' to install a specified firmware + version + - Allow overriding the detected machine type for debugging and + development + - Restart the BMC after installing BCM updates + - Show the device serial number and instance IDs by default + - Support dumping the MTD image to a firmware blob + - Take a device inhibit when updating a device + - Use the CFI manufacturer ID to set the vendor + - Use the correct icon automatically for more hardware + + This release fixes the following bugs: + - Add signed-payload metadata for more devices + - Allow Capsule-on-Disk to work in more cases + - Allow quirking the detected flashrom flash size + - Check for os-release on FWUPD_SYSCONFDIR + - Check the alignment when parsing raw firmware + - Check the update protocol exists when checking requirements + - Convert the build system to use meson tristate features + - Correctly probe USB-2 hubs with more than 7 ports + - Do not add the Windows compatibility ID to capsule devices + - Do not allow the DBX update for specific motherboards + - Do not expect KernelCmdline on Windows + - Do not export USB4 host controllers as updatable if they + don't have unique GUIDs + - Do not fallback to audio-card and use a more suitable icon + for USB hubs + - Do not hardcode the libexecdir to /usr/libexec + - Do not leak child processes when canceling + - Do not show unconnected or unreachable devices in the client + tools + - Do not throw away the TPM eventlog when uploading to the LVFS + - Do not use /var/run for the socket + - Export the version_lowest_raw value correctly + - Fix build for MacOS and add to the CI matrix + - Fix eventlog replay for Intel TXT machines + - Fix several small memory leaks + - Fix writing large mtd images than 10kb + - Ignore MTD devices that report EPERM on open + - Mark the ME region device locked if it is read only + - Never send the DeviceChanged signal with old data + - Only show the CLI time remaining for predictable status + phases + - Respect the NO_COLOR env variable + - Return the correct error when there is no GPIO device to open + - Support the new UPower PENDING device states + + This release adds support for the following hardware: + - CH341A SPI programmer + - Corsair Sabre RGB PRO and Slipstream USB receiver + - Genesys GL3521 and GL3590 hubs + - Google Servo Dock + - Logitech M550, M650 and K650 + - More ELAN fingerprint readers + - More integrated Wacom panels + - More NovaCustom machines + - More StaLabs StarLite machines + - More Tuxedo laptops + - Quectel EM05 + - FlatFrog devices + - System76 launch_lite_1 +- Rebase patches with quilt. +- Use ldconfig_scriptlets macro for post(un) handling. +- Add shlib_sover define and set it to 2, ease future updates. +- Add plugin_sover define and set it to 7, ease future updates, and + rename libfwupdplugin5 to libfwupdplugin7 following upstream + changes. +- Drop gtk-doc and pkgconfig(gtk-doc) BuildRequires: No longer + needed nor used. Following this, stop passing docs=gtkdoc to + meson, no longer recognized. +- Add pkgconfig(gi-docgen), pkgconfig(libcbor), pkgconfig(mm-glib), + pkgconfig(mbim-glib), pkgconfig(qmi-glib) and + pkgconfig(umockdev-1.0) BuildRequires, and conditional + pkgconfig(flashrom) BuildRequires: New dependencies. +- Update options passed to meson following upstream changes. +- Replace false for plugin_nvme and plugin_redfish with enabled, + build nvme and redfish plugins. +- Split out developer/api docs in new doc sub-package, add fdupes + BuildRequires and macros, remove duplicates. + ------------------------------------------------------------------- Thu Sep 22 14:48:43 UTC 2022 - Bjørn Lie -- Update to version 1.7.10: +- Update to version 1.7.10 (CVE-2022-3287, boo#1203852): + Always check the BDP partitions when getting all the possible ESPs + Correctly detect CET IBT @@ -13,7 +302,7 @@ Thu Sep 22 14:48:43 UTC 2022 - Bjørn Lie + Fix getting the new version number of the USI docking hardware + Fix HSI prefix for invalid chassis + Never save the Redfish auto-generated password to a - user-readable file + user-readable file (CVE-2022-3287, boo#1203852). + Only create users using IPMI when we've tested the hardware + Only fail the kernel tainted HSI test for specific taint reasons diff --git a/fwupd.obsinfo b/fwupd.obsinfo index 7ad4cb6..e44f2ec 100644 --- a/fwupd.obsinfo +++ b/fwupd.obsinfo @@ -1,4 +1,4 @@ name: fwupd -version: 1.7.10 -mtime: 1663854090 -commit: 38efba5ac045d1272123029a524e2eecd4e56233 +version: 1.8.6 +mtime: 1665157084 +commit: 2627e8ab6a8dd779f0e494bd0f6ff9dd76fa70cb diff --git a/fwupd.spec b/fwupd.spec index a41e3fd..9c6d698 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -36,23 +36,28 @@ %bcond_with fish_support %endif +%define shlib_sover 2 + Name: fwupd -Version: 1.7.10 +Version: 1.8.6 Release: 0 Summary: Device firmware updater daemon License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Management URL: https://fwupd.org/ -# Do not use upstream tarball, we are using source service! -#Source: https://github.com/%%{name}/%%{name}/archive/%%{version}.tar.gz Source: %{name}-%{version}.tar.xz + # PATCH-FIX-OPENSUSE fwupd-bsc1130056-shim-path.patch bsc#1130056 Patch1: fwupd-bsc1130056-change-shim-path.patch # PATCH-FIX-OPENSUSE fwupd-jscSLE-11766-close-efidir-leap-gap.patch jsc#SLE-11766 qkzhu@suse.com -- Set SLE and openSUSE esp os dir at runtime Patch2: fwupd-jscSLE-11766-close-efidir-leap-gap.patch +# PATCH-FEATURE-OPENSUSE harden_fwupd-offline-update.service.patch -- Harden services Patch3: harden_fwupd-offline-update.service.patch +# PATCH-FEATURE-OPENSUSE harden_fwupd-refresh.service.patch -- Harden services Patch4: harden_fwupd-refresh.service.patch + BuildRequires: dejavu-fonts +BuildRequires: fdupes %if %{with fish_support} BuildRequires: fish %endif @@ -62,7 +67,6 @@ BuildRequires: gnutls BuildRequires: gobject-introspection BuildRequires: gobject-introspection-devel BuildRequires: gpgme-devel -BuildRequires: gtk-doc BuildRequires: help2man BuildRequires: intltool BuildRequires: libelf-devel @@ -79,6 +83,10 @@ BuildRequires: pkgconfig(appstream-glib) >= 0.5.10 BuildRequires: pkgconfig(bash-completion) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(colorhug) >= 1.2.12 +%ifnarch s390x ppc64le +BuildRequires: pkgconfig(flashrom) +%endif +BuildRequires: pkgconfig(gi-docgen) BuildRequires: pkgconfig(gio-2.0) >= 2.45.8 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.48.8 BuildRequires: pkgconfig(glib-2.0) >= 2.45.8 @@ -86,22 +94,26 @@ BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gthread-2.0) -BuildRequires: pkgconfig(gtk-doc) >= 1.14 BuildRequires: pkgconfig(gudev-1.0) >= 232 BuildRequires: pkgconfig(gusb) >= 0.2.9 BuildRequires: pkgconfig(jcat) >= 0.1.3 BuildRequires: pkgconfig(json-glib-1.0) >= 1.1.1 BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(libcbor) BuildRequires: pkgconfig(libcurl) >= 7.62.0 BuildRequires: pkgconfig(libelf) BuildRequires: pkgconfig(libgcab-1.0) >= 1.0 BuildRequires: pkgconfig(libprotobuf-c) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(mbim-glib) +BuildRequires: pkgconfig(mm-glib) BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 BuildRequires: pkgconfig(protobuf) +BuildRequires: pkgconfig(qmi-glib) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(tss2-esys) >= 2.0 BuildRequires: pkgconfig(udev) +BuildRequires: pkgconfig(umockdev-1.0) BuildRequires: pkgconfig(xmlb) >= 0.1.13 %if %{with efi_fw_update} BuildRequires: gnu-efi @@ -132,21 +144,12 @@ the local machine. You can either use a GUI software manager like GNOME Software to view and apply updates, the command line tool or the system D-Bus interface directly. -%package -n libfwupd2 +%package -n libfwupd%{shlib_sover} Summary: Allow session software to update device firmware Group: System/Libraries Requires: %{name} >= %{version} -%description -n libfwupd2 -fwupd is a daemon to allows session software to update device firmware on -the local machine. - -%package -n libfwupdplugin5 -Summary: Allow session software to update device firmware -Group: System/Libraries -Requires: %{name} >= %{version} - -%description -n libfwupdplugin5 +%description -n libfwupd%{shlib_sover} fwupd is a daemon to allows session software to update device firmware on the local machine. @@ -158,14 +161,6 @@ Group: System/Libraries fwupd is a daemon to allows session software to update device firmware on the local machine. -%package -n typelib-1_0-FwupdPlugin-1_0 -Summary: GObject-introspection bindings for libfwupd -Group: System/Libraries - -%description -n typelib-1_0-FwupdPlugin-1_0 -fwupd is a daemon to allows session software to update device firmware on -the local machine. - %package -n dfu-tool Summary: Generic tool Device Firmware Upgrade (DFU) tool Group: Development/Tools/Other @@ -176,13 +171,21 @@ A generic tool to upload firmware to USB Devices based on Device Firmware Upgrad %package devel Summary: Allow session software to update device firmware Group: Development/Languages/C and C++ -Requires: libfwupd2 = %{version} -Requires: libfwupdplugin5 = %{version} +Requires: %{name} = %{version} +Requires: libfwupd%{shlib_sover} = %{version} +Requires: typelib-1_0-Fwupd-2_0 = %{version} %description devel fwupd is a daemon to allows session software to update device firmware on the local machine. +%package doc +Summary: Developer documentation for %{name} +BuildArch: noarch + +%description doc +Developer documentation for %{name}. + %package bash-completion Summary: Bash completion for fwupd Group: System/Management @@ -223,48 +226,50 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE" # Synaptics requires Dell support, i.e. x86 only %meson \ %if %{with efi_fw_update} - -Dplugin_uefi_capsule=true \ - -Dplugin_uefi_pk=true \ + -Dplugin_uefi_capsule=enabled \ + -Dplugin_uefi_pk=enabled \ -Defi_binary=false \ -Dsystemd_unit_user=root \ %else - -Dplugin_uefi_capsule=false \ - -Dplugin_uefi_pk=false \ + -Dplugin_uefi_capsule=disabled \ + -Dplugin_uefi_pk=disabled \ %endif %if %{with msr_support} - -Dplugin_msr=true \ + -Dplugin_msr=enabled \ %else - -Dplugin_msr=false \ + -Dplugin_msr=disabled \ %endif %if %{with dell_support} - -Dplugin_dell=true \ - -Dplugin_synaptics_mst=true \ + -Dplugin_dell=enabled \ + -Dplugin_synaptics_mst=enabled \ %else - -Dplugin_dell=false \ - -Dplugin_synaptics_mst=false \ + -Dplugin_dell=disabled \ + -Dplugin_synaptics_mst=disabled \ %endif %ifnarch %{ix86} x86_64 - -Dplugin_amt=false \ - -Dplugin_synaptics_rmi=false \ + -Dplugin_amt=disabled \ + -Dplugin_synaptics_rmi=disabled \ %endif - -Dplugin_nvme=false \ - -Dplugin_redfish=false \ - -Ddocs=gtkdoc \ - -Dsupported_build=true \ + -Dplugin_nvme=enabled \ + -Dplugin_redfish=enabled \ + -Ddocs=enabled \ + -Dsupported_build=enabled \ -Dtests=false \ +%ifarch s390x ppc64le + -Dplugin_flashrom=disabled \ +%endif %{nil} %meson_build %install %meson_install -# README.md is packaged as doc -rm %{buildroot}/usr/share/doc/fwupd/builder/README.md # Add SUSE specific rcfoo service symlink mkdir -p %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcfwupd-offline-update ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcfwupd-refresh %find_lang %{name} +%fdupes -s %{buildroot}%{_datadir}/doc # Do not ship default polkit .rules - openSUSE overrides them anyway - boo#1125428 rm %{buildroot}%{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules @@ -276,11 +281,7 @@ rm -fr %{buildroot}%{_datadir}/installed-tests rm -fr %{buildroot}%{_datadir}/fish %endif -%post -n libfwupd2 -p /sbin/ldconfig -%postun -n libfwupd2 -p /sbin/ldconfig - -%post -n libfwupdplugin5 -p /sbin/ldconfig -%postun -n libfwupdplugin5 -p /sbin/ldconfig +%ldconfig_scriptlets -n libfwupd%{shlib_sover} %preun %service_del_preun %{name}.service fwupd-offline-update.service fwupd-refresh.service @@ -337,7 +338,6 @@ rm -fr %{buildroot}%{_datadir}/fish %endif %{_datadir}/%{name}/metainfo/org.freedesktop.fwupd.remotes.lvfs-testing.metainfo.xml %{_datadir}/%{name}/metainfo/org.freedesktop.fwupd.remotes.lvfs.metainfo.xml -%{_datadir}/%{name}/quirks.d/*.quirk %{_datadir}/%{name}/remotes.d/vendor/firmware/README.md %{_mandir}/man1/fwupdagent.1%{?ext_man} %{_mandir}/man1/fwupdmgr.1%{?ext_man} @@ -365,42 +365,41 @@ rm -fr %{buildroot}%{_datadir}/fish %{_sysconfdir}/grub.d/35_fwupd %endif %{_udevrulesdir}/90-fwupd-devices.rules -%{_libdir}/fwupd-plugins-5/ %dir %{_datadir}/metainfo %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml %{_datadir}/icons/hicolor/* %{_prefix}/lib/systemd/system-shutdown/fwupd.shutdown %{_prefix}/lib/systemd/system-preset/fwupd-refresh.preset +%dir %{_libdir}/fwupd-%{version} +%{_libdir}/fwupd-%{version}/libfu_plugin_flashrom.so +%{_libdir}/fwupd-%{version}/libfu_plugin_modem_manager.so +%{_libdir}/fwupd-%{version}/libfwupdengine.so +%{_libdir}/fwupd-%{version}/libfwupdplugin.so +%{_libdir}/fwupd-%{version}/libfwupdutil.so +%{_datadir}/%{name}/quirks.d/builtin.quirk.gz %files -n dfu-tool %{_bindir}/dfu-tool %{_mandir}/man1/dfu-tool.1%{?ext_man} -%files -n libfwupd2 +%files -n libfwupd%{shlib_sover} %{_libdir}/libfwupd.so.* -%files -n libfwupdplugin5 -%{_libdir}/libfwupdplugin.so.* - %files -n typelib-1_0-Fwupd-2_0 %{_libdir}/girepository-1.0/Fwupd-2.0.typelib -%files -n typelib-1_0-FwupdPlugin-1_0 -%{_libdir}/girepository-1.0/FwupdPlugin-1.0.typelib - -%files lang -f %{name}.lang - %files devel -%doc %{_datadir}/gtk-doc/html/fwupd/ %{_datadir}/gir-1.0/Fwupd-2.0.gir -%{_datadir}/gir-1.0/FwupdPlugin-1.0.gir %{_datadir}/vala/vapi/fwupd.deps %{_datadir}/vala/vapi/fwupd.vapi %{_includedir}/fwupd-1/ %{_libdir}/pkgconfig/fwupd.pc -%{_libdir}/pkgconfig/fwupdplugin.pc %{_libdir}/libfwupd.so -%{_libdir}/libfwupdplugin.so + +%files doc +%doc %{_datadir}/doc/fwupd/ +%doc %{_datadir}/doc/libfwupd/ +%doc %{_datadir}/doc/libfwupdplugin/ %files bash-completion %{_datadir}/bash-completion/completions/fwupdmgr @@ -412,4 +411,6 @@ rm -fr %{buildroot}%{_datadir}/fish %{_datadir}/fish/vendor_completions.d/fwupdmgr.fish %endif +%files lang -f %{name}.lang + %changelog