bump to 0.6.9 and include systemd support

4 files changed, 67 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56f055cb6544..892f92347bf1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,27 @@
-pkgbase = python-btrfs-sxbackup
-	pkgdesc = Btrfs snapshot backup utility
-	pkgver = 0.5.8
-	pkgrel = 2
-	url = https://pypi.python.org/pypi/btrfs-sxbackup
+pkgbase = btrfs-sxbackup
+	pkgdesc = Incremental btrfs snapshot backups with push/pull support via SSH
+	pkgver = 0.6.9
+	pkgrel = 1
+	url = https://github.com/masc3d/btrfs-sxbackup
 	arch = i686
 	arch = x86_64
 	license = GPL
+	depends = bash
+	depends = python
 	depends = btrfs-progs
 	depends = python-setuptools
-	source = http://pypi.python.org/packages/source/b/btrfs-sxbackup/btrfs-sxbackup-0.5.8.tar.gz
-	md5sums = 22688774801bbc651e4440aa23b17607
+	optdepends = openssh: for remote push/pull
+	optdepends = lzop: compression support
+	optdepends = pv: progress indication
+	optdepends = s-nail: email notifications
+	provides = btrfs-sxbackup
+	conflicts = python-btrfs-sxbackup
+	source = https://github.com/masc3d/btrfs-sxbackup/archive/0.6.9.tar.gz
+	source = btrfs-sxbackup@.service
+	source = btrfs-sxbackup@.timer
+	md5sums = c581ec61e2dbccf4c9a1b63c677a573f
+	md5sums = c95336614c6ea4844fd6272868260f96
+	md5sums = 3eba800dc92659189b6f4c58e456f9aa
 
-pkgname = python-btrfs-sxbackup
+pkgname = btrfs-sxbackup
 
diff --git a/PKGBUILD b/PKGBUILD
index e9c8e608fcf5..bb3975a928bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,36 @@
-# Maintainer: Martin -nexus- Mlynář <nexus+arch@smoula.net>
-pkgname=python-btrfs-sxbackup
-pkgver=0.5.8
-pkgrel=2
-pkgdesc="Btrfs snapshot backup utility"
+# Maintainer: Pedro Silva <psilva@pedrosilva.pt>
+
+pkgname=btrfs-sxbackup
+pkgver=0.6.9
+pkgrel=1
+pkgdesc="Incremental btrfs snapshot backups with push/pull support via SSH"
 arch=('i686' 'x86_64')
-url="https://pypi.python.org/pypi/btrfs-sxbackup"
+url="https://github.com/masc3d/btrfs-sxbackup"
 license=('GPL')
-depends=(
-	'btrfs-progs'
-	'python-setuptools'
-)
-source=(http://pypi.python.org/packages/source/b/btrfs-sxbackup/btrfs-sxbackup-${pkgver}.tar.gz)
-md5sums=('22688774801bbc651e4440aa23b17607')
+
+depends=('bash'
+         'python'
+	     'btrfs-progs'
+	     'python-setuptools')
+optdepends=('openssh: for remote push/pull'
+            'lzop: compression support'
+            'pv: progress indication'
+            's-nail: email notifications')
+provides=('btrfs-sxbackup')
+conflicts=('python-btrfs-sxbackup')
+
+source=(https://github.com/masc3d/btrfs-sxbackup/archive/${pkgver}.tar.gz
+        ${pkgname}@.service
+        ${pkgname}@.timer)
+md5sums=('c581ec61e2dbccf4c9a1b63c677a573f'
+         'c95336614c6ea4844fd6272868260f96'
+         '3eba800dc92659189b6f4c58e456f9aa')
 
 package() {
+  install -D ${pkgname}@.service ${pkgdir}/usr/lib/systemd/system/${pkgname}@.service
+  install -D ${pkgname}@.timer ${pkgdir}/usr/lib/systemd/system/${pkgname}@.timer
+
   cd $srcdir/btrfs-sxbackup-$pkgver
-  python setup.py install --prefix=/usr --root=$pkgdir || return 1
+  python setup.py install --prefix=/usr --root=$pkgdir
+  install -D etc/btrfs-sxbackup.conf $pkgdir/etc/btrfs-sxbackup.conf
 }
diff --git a/btrfs-sxbackup@.service b/btrfs-sxbackup@.service
new file mode 100644
index 000000000000..f75c3b08ded0
--- /dev/null
+++ b/btrfs-sxbackup@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=btrfs-sxbackup run on %f
+
+[Service]
+Nice=19
+IOSchedulingClass=idle
+ExecStart=/usr/bin/btrfs-sxbackup run %f
diff --git a/btrfs-sxbackup@.timer b/btrfs-sxbackup@.timer
new file mode 100644
index 000000000000..0107c33233f2
--- /dev/null
+++ b/btrfs-sxbackup@.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Daily btrfs-sxbackup run on %I
+
+[Timer]
+OnCalendar=daily
+AccuracySec=1d
+Persistent=true
+
+[Install]
+WantedBy=multi-user.target