General package improvements

- Fix pkgver()
- Use /etc/usbguard for config files
- Don't overwrite user configuration

1 files changed, 9 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e22396e7bccc..dcc640fe9ab3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=usbguard-git
 _pkgname=usbguard
-pkgver=0.5.10.66.gbf28a52
-pkgrel=2
+pkgver=0.5.11.r0.gd78d1c5
+pkgrel=1
 license=('GPL2')
 pkgdesc='USBGuard is a software framework for implementing USB device authorization policies'
 makedepends=("git" "libqb-git" "libsodium")
@@ -17,23 +17,27 @@ sha256sums=(
 	'SKIP'
 	'644ae1819eaf405091878bdcf78a5f71d7b344346c4e67a24525e4fb442eed4d')
 provides=("usbguard")
+backup=(
+	"etc/usbguard/usbguard-daemon.conf"
+	"etc/usbguard/rules.conf")
 
 pkgver() {
 	cd "${srcdir}/${_pkgname}"
-  git describe --tags | sed -e 's:v::' -e 's/-/./g'
+  git describe --long | sed 's/^usbguard-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
 	cd "${srcdir}/${_pkgname}"
 	patch -p1 <../disable_json_regression_test.patch
   ./autogen.sh
-  ./configure --prefix=/usr --sbindir=/usr/bin --libdir=/usr/lib \
+  ./configure --prefix=/usr --sysconfdir=/etc -sbindir=/usr/bin --libdir=/usr/lib \
 	--enable-systemd \
 	--with-bundled-json \
 	--with-bundled-spdlog \
 	--with-bundled-catch \
 	--with-bundled-pegtl
   make
+	touch rules.conf
 }
 
 check() {
@@ -46,4 +50,5 @@ package() {
 	make SYSTEMD_UNIT_DIR="/usr/lib/systemd/system" DESTDIR="$pkgdir/" install
 	mkdir -p ${pkgdir}/etc/usbguard
 	install -p -m 644 ./usbguard-daemon.conf ${pkgdir}/etc/usbguard/usbguard-daemon.conf
+	install -p -m 644 ./rules.conf ${pkgdir}/etc/usbguard/rules.conf
 }