upgpkg: borgmatic 1.2.14-4

* Patch borgmatic.service.
* Include borgmatic.timer... Sorry! :(

5 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef6da611f353..f4488682cc4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = borgmatic
 	pkgdesc = A wrapper script for Borg backup software that creates and prunes backups
 	pkgver = 1.2.14
-	pkgrel = 3
+	pkgrel = 4
 	url = https://torsion.org/borgmatic/
 	install = borgmatic.install
 	arch = any
@@ -14,10 +14,10 @@ pkgbase = borgmatic
 	depends = python-ruamel-yaml
 	source = borgmatic-1.2.14.tar.gz::https://projects.torsion.org/witten/borgmatic/archive/1.2.14.tar.gz
 	source = borgmatic.install
-	source = borgmatic.service
+	source = borgmatic.service.patch
 	sha256sums = b77f8aff75208a69211d2453baf287001b4f54f858c56f8daba240461485d0f8
 	sha256sums = 2862763feea83e3ee0fb65c9f3fec648312486cd8ab48cd7cac70a7bb742b55b
-	sha256sums = 1b033f96dc7404c26fad0f5fbbdda2fd93959869a7737092049ed7cfe994602e
+	sha256sums = f27cf21c8076d9de96ee7931ec6660f7f5d9e9fcaa6346612701eff32fa5127d
 
 pkgname = borgmatic
 
diff --git a/.gitignore b/.gitignore
index 4e2bc6d85f7c..4e082594b556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@
 !.gitignore
 !PKGBUILD
 !borgmatic.install
-!borgmatic.service
+!borgmatic.service.patch
diff --git a/PKGBUILD b/PKGBUILD
index 75f0a0436f91..580c78e78a6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname='borgmatic'
 pkgver=1.2.14
-pkgrel=3
+pkgrel=4
 pkgdesc='A wrapper script for Borg backup software that creates and prunes backups'
 arch=('any')
 url='https://torsion.org/borgmatic/'
@@ -16,12 +16,12 @@ install="${pkgname}.install"
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://projects.torsion.org/witten/borgmatic/archive/${pkgver}.tar.gz"
   "${pkgname}.install"
-  "${pkgname}.service"
+  "${pkgname}.service.patch"
 )
 sha256sums=(
   'b77f8aff75208a69211d2453baf287001b4f54f858c56f8daba240461485d0f8'
   '2862763feea83e3ee0fb65c9f3fec648312486cd8ab48cd7cac70a7bb742b55b'
-  '1b033f96dc7404c26fad0f5fbbdda2fd93959869a7737092049ed7cfe994602e'
+  'f27cf21c8076d9de96ee7931ec6660f7f5d9e9fcaa6346612701eff32fa5127d'
 )
 
 _pytestdir="$(mktemp -d)"
@@ -29,6 +29,7 @@ _pytestdir="$(mktemp -d)"
 prepare() {
   cd "${pkgname}"
 
+  patch sample/systemd/borgmatic.service < "${srcdir}/borgmatic.service.patch"
   python setup.py -q install --root="${_pytestdir}"
 }
 
@@ -47,8 +48,7 @@ package() {
   python setup.py -q install --root="${pkgdir}" --optimize=1
   
   install -d "${pkgdir}/usr/lib/systemd/system"
-  install -m 644 "${srcdir}/borgmatic.service" "${pkgdir}/usr/lib/systemd/system/"
-  install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -m 644 sample/systemd/* "${pkgdir}/usr/lib/systemd/system/"
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/borgmatic.service b/borgmatic.service
deleted file mode 100644
index d52f338d2e26..000000000000
--- a/borgmatic.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=borgmatic backup
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/borgmatic
diff --git a/borgmatic.service.patch b/borgmatic.service.patch
new file mode 100644
index 000000000000..578a4bea4f17
--- /dev/null
+++ b/borgmatic.service.patch
@@ -0,0 +1,8 @@
+--- a/borgmatic.service	2018-12-25 23:01:08.000000000 -0600
++++ b/borgmatic.service	2018-12-26 16:21:13.692465228 -0600
+@@ -3,4 +3,4 @@
+
+ [Service]
+ Type=oneshot
+-ExecStart=/usr/local/bin/borgmatic
++ExecStart=/usr/bin/borgmatic