bump

4 files changed, 37 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d9c7078af5e..88649a374c9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,14 @@
-# Generated by mksrcinfo v8
-# Sun Jan 15 14:44:09 UTC 2017
 pkgbase = uhub
 	pkgdesc = A hub for the ADC network.
 	pkgver = 0.5.0
 	pkgrel = 6
 	url = http://www.uhub.org
 	install = uhub.install
-	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	depends = python2
-	depends = libsystemd
+	depends = libsystemd.so
 	backup = etc/uhub/motd.txt
 	backup = etc/uhub/plugins.conf
 	backup = etc/uhub/rules.txt
@@ -25,8 +22,7 @@ pkgbase = uhub
 	sha256sums = 4596250446414e765c62fe81976041c927ea714dc6116792fd33760ac49798f5
 	sha256sums = 039582eee0d99351212df47b9ad6a94443d8bc05b7f7289d63fffd19014ea561
 	sha256sums = 4bf39c6265d53e1b08385c8e339c9d7b4449637c29688b1bcd2091e5c2b6c9df
-	sha256sums = 36645ca1faeb2e1bf12edf736c68e8b70c12aa6dbe3f710acc7823d1addb9050
+	sha256sums = 94628376878d6b91c55deec62aad59ddfd9dd0d87dd4552aeeb202875f340a09
 	sha256sums = dfb3d51d95ef90e49b62cfa49d6a2cef58fb1f119f1d357f76ab1953000e5079
 
 pkgname = uhub
-
diff --git a/PKGBUILD b/PKGBUILD
index 04dd3a2fe0a0..0877e8f69dbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,35 +6,38 @@ pkgname=uhub
 pkgver=0.5.0
 pkgrel=6
 pkgdesc="A hub for the ADC network."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL')
 url='http://www.uhub.org'
-depends=('python2'
-         'libsystemd'
-         )
+depends=(
+  'python2'
+  'libsystemd.so'
+)
 makedepends=('cmake')
-source=("http://www.extatic.org/downloads/uhub/${pkgname}-${pkgver}-src.tar.bz2"
-        'systemd.patch::https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.patch'
-        'uhub.service'
-        'uhub.tmpfiles'
-        'uhub.sysuser'
-        )
-sha256sums=('4596250446414e765c62fe81976041c927ea714dc6116792fd33760ac49798f5'
-            '039582eee0d99351212df47b9ad6a94443d8bc05b7f7289d63fffd19014ea561'
-            '4bf39c6265d53e1b08385c8e339c9d7b4449637c29688b1bcd2091e5c2b6c9df'
-            '36645ca1faeb2e1bf12edf736c68e8b70c12aa6dbe3f710acc7823d1addb9050'
-            'dfb3d51d95ef90e49b62cfa49d6a2cef58fb1f119f1d357f76ab1953000e5079'
-            )
-backup=('etc/uhub/motd.txt'
-        'etc/uhub/plugins.conf'
-        'etc/uhub/rules.txt'
-        'etc/uhub/uhub.conf'
-        'etc/uhub/users.conf'
-        )
+source=(
+  "http://www.extatic.org/downloads/uhub/${pkgname}-${pkgver}-src.tar.bz2"
+  'systemd.patch::https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.patch'
+  'uhub.service'
+  'uhub.tmpfiles'
+  'uhub.sysuser'
+)
+sha256sums=(
+  '4596250446414e765c62fe81976041c927ea714dc6116792fd33760ac49798f5'
+  '039582eee0d99351212df47b9ad6a94443d8bc05b7f7289d63fffd19014ea561'
+  '4bf39c6265d53e1b08385c8e339c9d7b4449637c29688b1bcd2091e5c2b6c9df'
+  '94628376878d6b91c55deec62aad59ddfd9dd0d87dd4552aeeb202875f340a09'
+  'dfb3d51d95ef90e49b62cfa49d6a2cef58fb1f119f1d357f76ab1953000e5079'
+)
+backup=(
+  'etc/uhub/motd.txt'
+  'etc/uhub/plugins.conf'
+  'etc/uhub/rules.txt'
+  'etc/uhub/uhub.conf'
+  'etc/uhub/users.conf'
+)
 install=uhub.install
 
 prepare() {
-  mkdir -p build
   sed 's|/var/log/uhub.log|/var/log/uhub/uhub.log|g' \
       -i "uhub-${pkgver}/doc/plugins.conf" \
       -i "uhub-${pkgver}/doc/init.d.RedHat/etc/logrotate.d/uhub"
@@ -45,16 +48,17 @@ prepare() {
 }
 
 build() {
-  cd build
-  cmake "../uhub-${pkgver}" \
+  cmake -S "uhub-${pkgver}" -B build \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSTEMD_SUPPORT=ON
-  make
+
+  cmake --build build
 }
 
 package() {
-  make -C build DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" cmake --install build
+
   install -Dm644 "uhub-${pkgver}/doc/users.conf" "${pkgdir}/etc/uhub/users.conf"
   touch "${pkgdir}/etc/uhub/motd.txt"
 
@@ -73,4 +77,6 @@ package() {
 
   cd "uhub-${pkgver}"
   for i in $(find tools -type f); do install -Dm755 ${i} "${pkgdir}/usr/share/uhub/${i}"; done
+
+  install -d 750 "${pkgdir}/var/log/uhub"
 }
diff --git a/uhub.install b/uhub.install
index 867110265cde..54c3c33ac1e8 100644
--- a/uhub.install
+++ b/uhub.install
@@ -10,16 +10,9 @@ _instructions() {
 }
 
 post_install() {
-  post_upgrade $1
-
   _instructions
 }
 
-post_upgrade() {
-  install -dm744 -o uhub -g uhub /var/log/uhub
-  install -dm744 -o uhub -g uhub /var/lib/uhub
-}
-
 post_remove() {
   paths=(/etc/uhub /var/lib/uhub /var/log/uhub)
 
diff --git a/uhub.tmpfiles b/uhub.tmpfiles
index c548637bbd94..cfcd1e261053 100644
--- a/uhub.tmpfiles
+++ b/uhub.tmpfiles
@@ -1 +1,2 @@
-d /run/uhub 0755 uhub uhub
+d /run/uhub 0755 uhub uhub -
+d /var/lib/uhub - uhub uhub -