Rewrite

1 files changed, 26 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6a5c2fb116e3..61c83cf8848b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,40 @@
-# Maintainer: Jameson Pugh <imntreal@gmail.com>
- 
-pkgname=onedrive-git
-pkgver=r99.7d700e1
+# Maintainer: Doug Newgard <scimmia at archlinux dot info>
+# Contributor: Jameson Pugh <imntreal@gmail.com>
+
+_pkgname=onedrive
+pkgname=$_pkgname-git
+pkgver=1.1.r13.g7d700e1
 pkgrel=1
-pkgdesc="Free OneDrive client written in D"
+pkgdesc='Free OneDrive client written in D'
 arch=('i686' 'x86_64')
-url="https://github.com/skilion/onedrive"
+url='https://github.com/skilion/onedrive'
 license=('GPL3')
-depends=('dmd' 'curl' 'sqlite')
-provides=('onedrive')
+depends=('curl' 'sqlite')
+makedepends=('dmd')
+provides=("onedrive=$pkgver")
 conflicts=('onedrive')
-source=("${pkgname}::git+https://github.com/skilion/onedrive.git"
-        'service.patch')
-sha256sums=('SKIP'
-            '1dba1975b660f7f53dff7a2c93cc954251e1aed8d46e6c3464c399b740f7cb5c')
- 
+backup=('etc/onedrive.conf')
+source=("git://github.com/skilion/onedrive.git")
+sha256sums=('SKIP')
+
 pkgver() {
-  cd ${pkgname}
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd $_pkgname
+
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd "${srcdir}/${pkgname}"
-  
-  patch -p0 < ../service.patch
+  sed -i 's|/usr/local|/usr|g' $_pkgname/onedrive.service
 }
-build() {
-  cd "${srcdir}/${pkgname}"
 
-  make
+build() {
+  make -C $_pkgname
 }
- 
+
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd $_pkgname
 
-  install -dm 755 "${pkgdir}/usr/bin"
-  install -dm 755 "${pkgdir}/etc"
-  install -dm 755 "${pkgdir}/usr/lib/systemd/system"
-  install -m 755 onedrive "${pkgdir}/usr/bin/"
-  install -m 644 onedrive.conf "${pkgdir}/etc/"
-  install -m 644 onedrive.service "${pkgdir}/usr/lib/systemd/system/"
+  install -Dm755 onedrive -t "$pkgdir/usr/bin/"
+  install -Dm644 onedrive.conf -t "$pkgdir/etc/"
+  install -Dm644 onedrive.service -t "$pkgdir/usr/lib/systemd/user/"
 }
- 
-# vim:set ts=2 sw=2 et: