Rm config, add patch, fix pkgver

1 files changed, 12 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1edb625e687a..e4604c5dc1ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,9 @@
 
 _pkgname=onedrive
 pkgname=$_pkgname-git
-pkgver=1.1.r36.g203062f
+pkgver=r132.ge03d384
 pkgrel=1
+epoch=1
 pkgdesc='Free OneDrive client written in D'
 arch=('i686' 'x86_64')
 url='https://github.com/skilion/onedrive'
@@ -14,17 +15,22 @@ makedepends=('dmd')
 provides=("onedrive=$pkgver")
 conflicts=('onedrive')
 backup=('etc/onedrive.conf')
-source=("git://github.com/skilion/onedrive.git")
-sha256sums=('SKIP')
+source=('git+https://github.com/skilion/onedrive.git'
+        'https://patch-diff.githubusercontent.com/raw/skilion/onedrive/pull/165.patch')
+sha256sums=('SKIP'
+            'ca804dc6cc5577cfa81f1bae47e58010345b5441c4e4faf13b6deba6208f7601')
 
 pkgver() {
   cd $_pkgname
 
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  printf 'r%s.g%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  sed -i 's|/usr/local|/usr|g' $_pkgname/onedrive.service
+  cd $_pkgname
+
+  sed -i 's|/usr/local|/usr|g' onedrive.service
+  patch -Np1 < ../165.patch
 }
 
 build() {
@@ -35,6 +41,6 @@ package() {
   cd $_pkgname
 
   install -Dm755 onedrive -t "$pkgdir/usr/bin/"
-  install -Dm644 onedrive.conf -t "$pkgdir/etc/"
+  install -Dm644 config "$pkgdir/usr/share/onedrive/config.default"
   install -Dm644 onedrive.service -t "$pkgdir/usr/lib/systemd/user/"
 }