Fork for davidbartonau fork

2 files changed, 83 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ce35a4cac1c..2e730f74bcf5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,34 @@
-pkgbase = zbackup
+pkgbase = zbackup-davidbartonau
 	pkgdesc = A versatile deduplicating backup tool
-	pkgver = 1.4.4
+	pkgver = 1.5
 	pkgrel = 1
-	url = http://zbackup.org
+	url = https://github.com/davidbartonau/zbackup
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	checkdepends = python
 	makedepends = cmake
 	depends = xz
 	depends = openssl
 	depends = protobuf
-	source = https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz
-	md5sums = 0753ca5d61533f951d6ebb6f087efa0b 
+	conflicts = zbackup
+	conflicts = zbackup-git
+	source = https://github.com/davidbartonau/zbackup/archive/1.5.tar.gz
+	md5sums = ad15fe626eefdb835ec81e0a2d38892c
 
-pkgname = zbackup
+pkgname = zbackup-davidbartonau
+	optdepends = zbackup-davidbartonau-tartool: utility to make filesystem backups with tar and zbackup
 
+pkgname = zbackup-davidbartonau-tartool
+	pkgdesc = A versatile deduplicating backup tool (tartool)
+	depends = xz
+	depends = openssl
+	depends = protobuf
+	depends = tar
+
+pkgname = zbackup-davidbartonau-compat
+	pkgdesc = A versatile deduplicating backup tool (metapackage including zbackup + tartool)
+	depends = zbackup-davidbartonau
+	depends = zbackup-davidbartonau-tartool
+	provides = zbackup
+	provides = zbackup-git
diff --git a/PKGBUILD b/PKGBUILD
index 648d834985ec..6ecd6741821c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,71 @@
-# Maintainer: Felix Braun <hazzl@falix.de>
-pkgname=zbackup
-pkgver=1.4.4
+# Maintainer: Isabelle COWAN-BERGMAN « izzi at izzette．com »
+# Contributor: Felix Braun <hazzl@falix.de>
+pkgbase='zbackup-davidbartonau'
+pkgname=("$pkgbase" "$pkgbase-tartool" "$pkgbase-compat")
+pkgver=1.5
 pkgrel=1
 pkgdesc='A versatile deduplicating backup tool'
 arch=('i686' 'x86_64')
-url='http://zbackup.org'
+url='https://github.com/davidbartonau/zbackup'
 license=('GPL2')
 depends=('xz' 'openssl' 'protobuf')
 makedepends=('cmake')
-source=(https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz)
-md5sums=('0753ca5d61533f951d6ebb6f087efa0b')
+checkdepends=('python')
+conflicts=('zbackup' 'zbackup-git')
+source=("$url/archive/$pkgver.tar.gz")
+md5sums=('ad15fe626eefdb835ec81e0a2d38892c')
+
+prepare() {
+  declare -a cmakeflags=(-DCMAKE_INSTALL_PREFIX='/usr'
+                         -DCMAKE_CXX_STANDARD='11')
+
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  cmake "$srcdir/zbackup-$pkgver"  "${cmakeflags[@]}"
+
+  mkdir -p "$srcdir/build-tartool"
+  cd "$srcdir/build-tartool"
+  cmake "$srcdir/zbackup-$pkgver/tools/tartool" "${cmakeflags[@]}"
+}
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make
-  cd tartool
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make
+  make -C "$srcdir/build"
+  make -C "$srcdir/build-tartool"
+}
+
+check() {
+  cd "$srcdir/zbackup-$pkgver"
+
+  rm -rf "$srcdir/test"
+  mkdir "$srcdir/test"
+
+  # TODO: Run the other tests and run with encryption.
+  echo "Running regression tests ..."
+  python tests/regression/regression.py \
+    --zbackup "$srcdir/build/zbackup" \
+    --tmp "$srcdir/test" \
+    --samples "$srcdir/zbackup-$pkgver" \
+    --seed 123 \
+    --loops 1 \
+    --add-per-loop 60 \
+    --delete-per-loop 50 \
+    --log-level 1 || return 1
+}
+
+package_zbackup-davidbartonau() {
+  optdepends=("$pkgbase-tartool: utility to make filesystem backups with tar and zbackup")
+  make -C "$srcdir/build" DESTDIR="$pkgdir" install
+}
+
+package_zbackup-davidbartonau-tartool() {
+  depends+=('tar')
+  pkgdesc+=" (tartool)"
+  make -C "$srcdir/build-tartool" DESTDIR="$pkgdir" install
 }
 
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  cd tartool
-  make DESTDIR="${pkgdir}" install
+package_zbackup-davidbartonau-compat() {
+  pkgdesc+=" (metapackage including zbackup + tartool)"
+  depends=("$pkgbase" "$pkgbase-tartool")
+  provides=('zbackup' 'zbackup-git')
 }