Merge with differences from community/btrbk

2 files changed, 24 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c213f387c41a..8e9b73437996 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = btrbk-git
-	pkgdesc = Backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations
-	pkgver = 0.32.5.r28.ga75765c
+	pkgdesc = Tool for creating snapshots and remote backups of btrfs subvolumes
+	pkgver = 0.32.6.r0.g5e44bc6
 	pkgrel = 1
 	url = https://digint.ch/btrbk/
 	arch = any
@@ -9,9 +9,11 @@ pkgbase = btrbk-git
 	makedepends = git
 	depends = btrfs-progs
 	depends = perl
-	optdepends = mbuffer: send/receive buffering and rate limiting, progress bars
-	optdepends = openssh: transfer backups from/to remote locations
-	optdepends = sudo: btrfs-progs-sudo backend
+	optdepends = bash: for contrib scripts
+	optdepends = mbuffer: for rate limiting and progress bars
+	optdepends = openssh: for transfering backups to/from remote hosts
+	optdepends = python: for contrib scripts
+	optdepends = sudo: for btrfs-progs-sudo backend
 	provides = btrbk
 	conflicts = btrbk
 	source = btrbk-git::git+https://github.com/digint/btrbk.git
diff --git a/PKGBUILD b/PKGBUILD
index 6b0b987718ab..738572ab2f7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,21 @@
 # Contributor: Daniel J. Campos <dcampos2015 at my dot fit dot edu>
 
 pkgname=btrbk-git
-pkgver=0.32.5.r28.ga75765c
+pkgver=0.32.6.r0.g5e44bc6
 pkgrel=1
-pkgdesc="Backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations"
-arch=('any')
+pkgdesc="Tool for creating snapshots and remote backups of btrfs subvolumes"
+arch=(any)
 url="https://digint.ch/btrbk/"
-license=('GPL3')
-depends=('btrfs-progs' 'perl')
-makedepends=('asciidoctor' 'git')
-optdepends=('mbuffer: send/receive buffering and rate limiting, progress bars'
-            'openssh: transfer backups from/to remote locations'
-            'sudo: btrfs-progs-sudo backend')
+license=(GPL3)
+depends=(btrfs-progs perl)
+makedepends=(asciidoctor git)
+optdepends=(
+  'bash: for contrib scripts'
+  'mbuffer: for rate limiting and progress bars'
+  'openssh: for transfering backups to/from remote hosts'
+  'python: for contrib scripts'
+  'sudo: for btrfs-progs-sudo backend'
+)
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=("$pkgname::git+https://github.com/digint/btrbk.git")
@@ -23,7 +27,10 @@ pkgver() {
   git -C $pkgname describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+build() {
+  make -C $pkgname
+}
+
 package() {
   make -C $pkgname DESTDIR="$pkgdir/" install
 }
-