diff --git a/extra/fwupd/.SRCINFO b/extra/fwupd/.SRCINFO index f4ef0221d..c360795f3 100644 --- a/extra/fwupd/.SRCINFO +++ b/extra/fwupd/.SRCINFO @@ -1,10 +1,10 @@ pkgbase = fwupd pkgdesc = Simple daemon to allow session software to update firmware pkgver = 1.9.11 - pkgrel = 1 + pkgrel = 2 url = https://github.com/fwupd/fwupd arch = x86_64 - license = LGPL + license = LGPL-2.1-or-later checkdepends = umockdev makedepends = bash-completion makedepends = gi-docgen diff --git a/extra/fwupd/PKGBUILD b/extra/fwupd/PKGBUILD index 2cc69dde3..358c53c5a 100644 --- a/extra/fwupd/PKGBUILD +++ b/extra/fwupd/PKGBUILD @@ -13,11 +13,11 @@ pkgname=(fwupd fwupd-docs) pkgver=1.9.11 -pkgrel=1 +pkgrel=2 pkgdesc="Simple daemon to allow session software to update firmware" arch=(x86_64) url='https://github.com/fwupd/fwupd' -license=(LGPL) +license=(LGPL-2.1-or-later) depends=( bluez flashrom @@ -80,7 +80,7 @@ build() { } check() { - meson test -C build + meson test -C build --print-errorlogs } _pick() { @@ -107,11 +107,9 @@ package_fwupd() { 'etc/fwupd/remotes.d/vendor.conf' ) - DESTDIR="${pkgdir}" meson install -C build + meson install -C build --destdir "${pkgdir}" # Add fwupd user https://bugs.archlinux.org/task/79653 install -D -m644 fwupd.sysusers "${pkgdir}"/usr/lib/sysusers.d/fwupd.conf - # Fixup mode to match polkit - install -d -o root -g 102 -m 750 "${pkgdir}"/usr/share/polkit-1/rules.d # Remove the tests rm -r "${pkgdir}"/usr/share/installed-tests/ mv "${pkgdir}"/usr/bin/{,fwupd-}dbxtool