Accepting request 825269 from Base:System

OBS-URL: https://build.opensuse.org/request/show/825269
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fwupd?expand=0&rev=28

_multibuild

@@ -0,0 +1,4 @@
+<multibuild>
+  <package>openSUSE</package>
+  <package>SLE</package>
+</multibuild>

_service

@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>
-    <param name="revision">1.4.2</param>
+    <param name="revision">1.4.5</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/hughsie/fwupd.git</param>
-              <param name="changesrevision">e43f42b7df4875355c4e99c4492743f469e47614</param></service></servicedata>
+              <param name="changesrevision">37d3879e55ef3b63e98aa30d09392e3918b76d02</param></service></servicedata>

fwupd-1.4.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7fd991c4058e6784eb78da665a20896fbdb9f068ad2f91daca9bfc8ec3553a8
-size 1696536

fwupd-1.4.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e08d2fd6898d2a688426b4e62b90933d75a6d62db1e7d7a875b8dd664cc743db
+size 1706248

fwupd.changes

@@ -1,3 +1,67 @@
+-------------------------------------------------------------------
+Thu Jul 30 14:52:34 UTC 2020 - dimstar@opensuse.org
+
+- Update to version 1.4.5:
+  * Add XB_QUERY_FLAG_FORCE_NODE_CACHE
+  * Add support for a delayed activation flow for Thunderbolt
+  * Allow firmware to require specific features from front-end clients
+  * Allow multi-byte FuUdevDevice preads and writes
+  * Be more defensive when remotes are missing required keys
+  * Disable the SQLite lookaside cache
+  * ccgx: Add more hybrid dock support
+  * ccgx: Modify readme to remove customer info
+  * ccgx: add new protocol for dmc dock
+  * ccgx: remove verify flag in plugin
+  * modem-manager: read the vendor ID directly from sysfs attribute Fixes: #2209
+  * thelio-io: Add the DFU instance ID as a counterpart only
+  * thunderbolt: Add a new subclassed thunderbolt firmware update type
+  * thunderbolt: Allow quirks to skip the authentication step
+  * thunderbolt: drop support for force power
+  * tpm-eventlog: fix PCR0 calculation
+  * uefi: check for free space after cleaning up ESP
+  * vli: Add dual-image feature for VL103 backup firmware
+  * vli: Add the project ID shared SPI PD controllers
+  * vli: Allow chained usb hub devices where the parent needs GPIOB reset
+  * vli: Do not modify the class vfuncs depending on device type
+  * vli: Do not use GUID matching for the MSP device
+  * vli: Rename FuVliUsbhubI2cDevice to FuVliUsbhubMsp430Device
+  * vli: Set FuQuirks on the shared SPI object
+  * vli: Set the i2c instance IDs in probe()
+  * vli: Use the GPIOB reset for the MiniDock VL103
+  * vli: Wait for the root device to be replugged when updating the MSP430
+
+-------------------------------------------------------------------
+Thu Jul 30 14:52:20 UTC 2020 - dimstar@opensuse.org
+
+- Update to version 1.4.4:
+  * Release fwupd 1.4.4
+  * Fix regression when checking for downgraded metadata
+
+-------------------------------------------------------------------
+Thu Jul 30 14:52:05 UTC 2020 - dimstar@opensuse.org
+
+- Update to version 1.4.3:
+  * Release fwupd 1.4.3
+  * ata: A OUI quirk for Kingston
+  * ccgx: Fix a potential division by zero
+  * Check the device requirements when returning from GetDetails
+  * fu-engine: Allow --plugin-whitelist to use dashes instead of
+    underscores
+  * Always enforce the metadata signature has a valid timestamp
+  * ccgx: modify install duration for dmc device
+  * ccgx: Add support for HP DMC dock devices
+  * dell-dock: prevent updates to occur via synaptics-mst plugin
+  * dell-dock: Capture the dock SKU in metadata
+  * synaptics-prometheus: Force the minor version from 0x02 to 0x01
+    to make sure the devices can be updated back to 0x01.
+  * Generate a body for github releases (Fixes: #2034)
+
+-------------------------------------------------------------------
+Fri Jul 24 06:52:18 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
+
+- Build the package separately for openSUSE and SLE using
+  _multibuild (jsc#SLE-11744).
+
 -------------------------------------------------------------------
 Wed Jun 03 15:32:46 UTC 2020 - dimstar@opensuse.org
 

fwupd.spec

@@ -17,18 +17,37 @@
 # needssslcertforbuild
 
 
+%define flavor @BUILD_FLAVOR@%{nil}
+
+%if "%{flavor}" == ""
+ExclusiveArch:  %{nil}
+%else
+%define branding_name %{flavor}
+%if "%{flavor}" == "SLE"
+%define build_SLE 1
+%else
+%define build_openSUSE 1
+%endif
+%endif
+
+%if (0%{?build_SLE} && 0%{?is_opensuse}) || (0%{?build_openSUSE} && ! 0%{?is_opensuse})
+# Don't build SLE branding on openSUSE and vice-versa
+ExclusiveArch:  %{nil}
+%endif
+
 %ifarch %{ix86} x86_64 aarch64
 %bcond_without efi_fw_update
 %else
 %bcond_with efi_fw_update
 %endif
-%if 0%{?is_opensuse}
+%if 0%{?build_openSUSE}
 %global efidir opensuse
 %else
 %global efidir sles
 %endif
+
 Name:           fwupd
-Version:        1.4.2
+Version:        1.4.5
 Release:        0
 Summary:        Device firmware updater daemon
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -76,7 +95,7 @@ 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.0
+BuildRequires:  pkgconfig(jcat) >= 0.1.3
 BuildRequires:  pkgconfig(json-glib-1.0) >= 1.1.1
 BuildRequires:  pkgconfig(libarchive)
 BuildRequires:  pkgconfig(libelf)