bump pkgrel, add conflicts to pkgbuild

2 files changed, 14 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7da9d907cc90..904dd77b36ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = usbguard-qt
 	pkgdesc = USBGuard Qt GUI
 	pkgver = 0.8.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.com/WheelchairArtist/usbguard-qt
 	arch = x86_64
 	license = GPL2
 	makedepends = qt6-base
 	depends = usbguard
+	conflicts = usbguard-applet-qt
 	replaces = usbguard-applet-qt
 	source = https://gitlab.com/WheelchairArtist/usbguard-qt/-/archive/0.8.1/usbguard-qt-0.8.1.tar.gz?path=src
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 943577c54ded..c88407f6036b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,34 @@
 # Maintainer: Kazel <address at domain dot tld>
 pkgname=usbguard-qt
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="USBGuard Qt GUI"
+
 arch=("x86_64")
-url="https://gitlab.com/WheelchairArtist/usbguard-qt"
+url="https://gitlab.com/WheelchairArtist/$pkgname"
 license=('GPL2')
+
 replaces=('usbguard-applet-qt')
+conflicts=('usbguard-applet-qt')
+
 depends=("usbguard")
 makedepends=("qt6-base")
-source=($url/-/archive/$pkgver/usbguard-qt-$pkgver.tar.gz?path=src)
+
+source=($url/-/archive/$pkgver/$pkgname-$pkgver.tar.gz?path=src)
 sha512sums=("SKIP")
 
 prepare() {
-    cd "${srcdir}/usbguard-qt-$pkgver-src/src"
+    cd "${srcdir}/$pkgname-$pkgver-src/src"
     qmake6 -o Makefile usbguard-qt.pro
 
 }
 
 build() {
-    cd "${srcdir}/usbguard-qt-$pkgver-src/src"
+    cd "${srcdir}/$pkgname-$pkgver-src/src"
     make
 }
 
 package() {
-    install -Dm 0755 -o root -g root "${srcdir}/usbguard-qt-$pkgver-src/src/$pkgname" "${pkgdir}/usr/bin/$pkgname"
-    install -Dm 0644 -o root -g root "${srcdir}/usbguard-qt-$pkgver-src/src/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm 0755 -o root -g root "${srcdir}/$pkgname-$pkgver-src/src/$pkgname" "${pkgdir}/usr/bin/$pkgname"
+    install -Dm 0644 -o root -g root "${srcdir}/$pkgname-$pkgver-src/src/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 }