sync with community package updates

3 files changed, 21 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a792d4740503..9e9484d1b603 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu May 25 00:06:06 UTC 2017
+# Thu Jun  1 06:27:54 UTC 2017
 pkgbase = umurmur-openssl
 	pkgdesc = Minimalistic Mumble server - built with openssl
 	pkgver = 0.2.17
@@ -16,8 +16,8 @@ pkgbase = umurmur-openssl
 	backup = etc/umurmur/umurmur.conf
 	source = umurmur-0.2.17.tar.gz::https://github.com/umurmur/umurmur/archive/0.2.17.tar.gz
 	source = umurmur.service
-	md5sums = b06566c896a8b4ac32ca00920c8dd093
-	md5sums = d9d556e4ffa77e193fb40ce508804720
+	sha256sums = e77b7b6616768f4a1c07442afe49a772692f667b00c23cc85909d4dd0ce206d2
+	sha256sums = 3575e69da5ad1fc8541ef37af90cdd245e3202980589ffd26d124fd9e785b738
 
 pkgname = umurmur-openssl
 
diff --git a/PKGBUILD b/PKGBUILD
index de2f6aef3eaf..f5632ca8b13d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,34 +8,36 @@ pkgname=umurmur-openssl
 pkgver=0.2.17
 pkgrel=1
 pkgdesc='Minimalistic Mumble server - built with openssl'
-arch=('i686' 'x86_64')
 url='https://github.com/umurmur/umurmur'
+arch=('i686' 'x86_64')
 license=('custom')
 depends=('openssl' 'libconfig' 'protobuf-c')
 makedepends=('cmake')
-install=$_pkgname.install
 backup=('etc/umurmur/umurmur.conf')
-source=($_pkgname-$pkgver.tar.gz::$url/archive/${pkgver}.tar.gz
+install=${_pkgname}.install
+source=(${_pkgname}-${pkgver}.tar.gz::https://github.com/umurmur/umurmur/archive/${pkgver}.tar.gz
         umurmur.service)
-md5sums=('b06566c896a8b4ac32ca00920c8dd093'
-         'd9d556e4ffa77e193fb40ce508804720')
+sha256sums=('e77b7b6616768f4a1c07442afe49a772692f667b00c23cc85909d4dd0ce206d2'
+            '3575e69da5ad1fc8541ef37af90cdd245e3202980589ffd26d124fd9e785b738')
 
 prepare() {
-  cd $_pkgname-${pkgver}
+  cd ${_pkgname}-${pkgver}
+  mkdir build
 }
 
 build() {
-  cd $_pkgname-${pkgver}
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DSSL=openssl
+  cd ${_pkgname}-${pkgver}/build
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSSL=openssl
   make
 }
 
 package() {
-  cd $_pkgname-${pkgver}
-  make DESTDIR="$pkgdir" install
-  install -dm0755 $pkgdir/etc/umurmur/
-  mv $pkgdir/usr/etc/umurmur.conf $pkgdir/etc/umurmur/
-  rmdir $pkgdir/usr/etc
-  install -Dm644 ../umurmur.service "$pkgdir"/usr/lib/systemd/system/umurmur.service
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$_pkgname/LICENSE
+  cd ${_pkgname}-${pkgver}
+  make -C build DESTDIR="${pkgdir}" install
+  install -Dm 644 "${pkgdir}/usr/etc/umurmur.conf" -t "${pkgdir}/etc/umurmur"
+  rm -r "${pkgdir}/usr/etc"
+  install -Dm 644 "${srcdir}/umurmur.service" -t "${pkgdir}/usr/lib/systemd/system"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
diff --git a/umurmur.service b/umurmur.service
index 329f16803674..034e7a2d0acc 100644
--- a/umurmur.service
+++ b/umurmur.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=A minimalistic Mumble server
+Description=Minimalistic Mumble server
 After=network.target
 
 [Service]