summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072019-09-09 20:08:35 +0200
committersL1pKn072019-09-09 20:08:35 +0200
commit652712c4a87f43938adf9767af1a5fa9ecc4bd42 (patch)
tree9af891dad2ab9409ed0d1b14d4e60406f5d3ff39
parent1f79dd893e15f9daea6436e2fcef740d9e7bd6d5 (diff)
downloadaur-652712c4a87f43938adf9767af1a5fa9ecc4bd42.tar.gz
bump
-rw-r--r--PKGBUILD16
-rw-r--r--uhub-git.install7
-rw-r--r--uhub.tmpfiles3
3 files changed, 11 insertions, 15 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 889bb99a30cc..1ce823782435 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,19 @@
# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
pkgname=uhub-git
-pkgver=0.5.0.26.g90d05c9
+pkgver=0.5.0.64.g78a7039
pkgrel=1
pkgdesc="A hub for the ADC network. (GIT Version)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
license=('LGPL')
url='http://www.uhub.org'
-depends=('libsystemd'
- 'python2'
+depends=('libsystemd.so'
+ 'sqlite'
)
makedepends=('cmake'
'git'
)
+optdepends=('python: scripts')
source=('git+https://github.com/janvidar/uhub.git'
'uhub.sysuser'
'uhub.service'
@@ -21,7 +22,7 @@ source=('git+https://github.com/janvidar/uhub.git'
sha256sums=('SKIP'
'dfb3d51d95ef90e49b62cfa49d6a2cef58fb1f119f1d357f76ab1953000e5079'
'4bf39c6265d53e1b08385c8e339c9d7b4449637c29688b1bcd2091e5c2b6c9df'
- '36645ca1faeb2e1bf12edf736c68e8b70c12aa6dbe3f710acc7823d1addb9050'
+ '94628376878d6b91c55deec62aad59ddfd9dd0d87dd4552aeeb202875f340a09'
)
install=uhub-git.install
backup=('etc/uhub/motd.txt'
@@ -41,13 +42,12 @@ prepare() {
sed 's|/var/log/uhub.log|/var/log/uhub/uhub.log|g' \
-i uhub/doc/plugins.conf \
-i uhub/doc/init.d.RedHat/etc/logrotate.d/uhub
- for i in $(find uhub/tools -type f -name '*.py'); do sed 's|python|python2|g' -i ${i}; done
}
build() {
cd build
cmake ../uhub \
- -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSTEMD_SUPPORT=ON
@@ -73,4 +73,6 @@ package() {
install -Dm644 uhub/doc/getstarted.txt "${pkgdir}/usr/share/doc/uhub/getstarted.txt"
for i in $(find uhub/tools -type f); do install -Dm755 ${i} "${pkgdir}/usr/share/uhub/${i}"; done
+
+ install -d 750 "${pkgdir}/var/log/uhub"
}
diff --git a/uhub-git.install b/uhub-git.install
index 867110265cde..54c3c33ac1e8 100644
--- a/uhub-git.install
+++ b/uhub-git.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 -