Take over maintainership.

3 files changed, 60 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07baf74a3200..79cc9e6116c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,13 @@
 pkgbase = fwupd-git
 	pkgdesc = A simple daemon to allow session software to update firmware
-	pkgver = 1.2.5.r78.g6109652f
+	pkgver = 1.3.6.r62.g79309920
 	pkgrel = 1
-	url = https://github.com/hughsie/fwupd
+	url = https://github.com/fwupd/fwupd
+	arch = i686
 	arch = x86_64
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = LGPL
 	checkdepends = umockdev
 	makedepends = meson
@@ -19,7 +23,7 @@ pkgbase = fwupd-git
 	makedepends = python-pillow
 	makedepends = help2man
 	makedepends = gnu-efi-libs
-	makedepends = git
+	makedepends = tpm2-tss
 	depends = libxmlb
 	depends = efivar
 	depends = python
@@ -33,13 +37,21 @@ pkgbase = fwupd-git
 	depends = libgudev
 	depends = polkit
 	depends = shared-mime-info
-	optdepends = tpm2-abrmd: TPM2 support
-	optdepends = tpm2-tools: TPM2 support
+	depends = modemmanager
+	depends = tpm2-tss
+	provides = fwupd
 	conflicts = fwupd
 	backup = etc/fwupd/daemon.conf
+	backup = etc/fwupd/redfish.conf
+	backup = etc/fwupd/remotes.d/dell-esrt.conf
+	backup = etc/fwupd/remotes.d/fwupd-tests.conf
+	backup = etc/fwupd/remotes.d/lvfs-testing.conf
+	backup = etc/fwupd/remotes.d/lvfs.conf
+	backup = etc/fwupd/remotes.d/vendor-directory.conf
+	backup = etc/fwupd/remotes.d/vendor.conf
 	backup = etc/fwupd/uefi.conf
-	source = git+https://github.com/hughsie/fwupd.git
-	sha256sums = SKIP
+	source = git+https://github.com/fwupd/fwupd.git
+	sha512sums = SKIP
 
 pkgname = fwupd-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..6e08398035e0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/src
+/pkg
+/fwupd
+*.xz
+*.tar.*
+*.pkg.*
+*.zip
+*.zip.sig
diff --git a/PKGBUILD b/PKGBUILD
index 03bed3861a3d..849709e8c7d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,56 @@
-# Maintainer: Joel Teichroeb <joel@teichroeb.net>
-# Contributor: Bruno Pagani <archange@archlinux.org>
-# Contributor: Mirco Tischler <mt-ml at gmx dot de>
+# Maintainer: Kenneth Endfinger <kaendfinger@gmail.com>
 
 pkgname=fwupd-git
 _pkgname=fwupd
-pkgver=1.2.5.r78.g6109652f
+pkgver=1.3.6.r62.g79309920
 pkgrel=1
 pkgdesc="A simple daemon to allow session software to update firmware"
-arch=('x86_64')
-url="https://github.com/hughsie/fwupd"
+arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
+url="https://github.com/fwupd/fwupd"
 license=('LGPL')
 depends=('libxmlb' 'efivar' 'python' 'libsmbios' 'libgusb'
          'libsoup' 'json-glib' 'gcab' 'libarchive' 'gpgme'
-         'libgudev' 'polkit' 'shared-mime-info')
+         'libgudev' 'polkit' 'shared-mime-info' 'modemmanager'
+         'tpm2-tss')
 makedepends=('meson' 'valgrind' 'gobject-introspection' 'gtk-doc'
              'python-cairo' 'noto-fonts' 'noto-fonts-cjk' 'python-gobject' 'vala'
-             'bash-completion' 'python-pillow' 'help2man' 'gnu-efi-libs' 'git')
-optdepends=('tpm2-abrmd: TPM2 support'
-            'tpm2-tools: TPM2 support')
+             'bash-completion' 'python-pillow' 'help2man' 'gnu-efi-libs' 'tpm2-tss')
 checkdepends=('umockdev')
 conflicts=('fwupd')
-backup=('etc/fwupd/daemon.conf' 'etc/fwupd/uefi.conf')
-source=("git+https://github.com/hughsie/fwupd.git")
-sha256sums=('SKIP')
+provides=('fwupd')
+backup=('etc/fwupd/daemon.conf'
+        'etc/fwupd/redfish.conf'
+        'etc/fwupd/remotes.d/dell-esrt.conf'
+        'etc/fwupd/remotes.d/fwupd-tests.conf'
+        'etc/fwupd/remotes.d/lvfs-testing.conf'
+        'etc/fwupd/remotes.d/lvfs.conf'
+        'etc/fwupd/remotes.d/vendor-directory.conf'
+        'etc/fwupd/remotes.d/vendor.conf'
+        'etc/fwupd/uefi.conf')
+source=("git+https://github.com/fwupd/fwupd.git")
+sha512sums=('SKIP')
 
 pkgver() {
-    cd ${_pkgname}
+  cd "${_pkgname}"
 
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd ${_pkgname}
-    arch-meson -D b_lto=false ../build
-    ninja -v -C ../build
+  cd "${_pkgname}"
+  arch-meson -D b_lto=false ../build
+  ninja -v -C ../build
 }
 
+check() {
+  cd build
+  meson test
+}
 
 package() {
-    DESTDIR="${pkgdir}" ninja -C build install
-    # Fixup mode to match polkit
-    install -d -o root -g 102 -m 750 "${pkgdir}"/usr/share/polkit-1/rules.d
-    # Move D-BUS policy
-    mv "${pkgdir}"/{etc,usr/share}/dbus-1/system.d
-    rmdir "${pkgdir}"/etc/dbus-1
-    # Remove the tests
-    rm -r "${pkgdir}"/usr/share/installed-tests/
+  DESTDIR="${pkgdir}" ninja -C build install
+  # 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/
 }