resolve package conflicts

2 files changed, 8 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 915e59ad389c..0c52b0f89543 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nwg-panel
 	pkgdesc = GTK3-based panel for sway window manager
 	pkgver = 0.7.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/nwg-piotr/nwg-panel
 	arch = x86_64
 	license = MIT
@@ -24,6 +24,9 @@ pkgbase = nwg-panel
 	optdepends = wlr-randr: for non-sway Wayland WMs support
 	optdepends = swaync: for Sway Notification Center support
 	optdepends = ddcutil: for external displays brightness control
+	provides = nwg-panel
+	conflicts = nwg-panel
+	conflicts = nwg-panel-git
 	source = nwg-panel-0.7.4.tar.gz::https://github.com/nwg-piotr/nwg-panel/archive/v0.7.4.tar.gz
 	md5sums = 8dd0ee3d3a271f2b2948111d99972de0
 
diff --git a/PKGBUILD b/PKGBUILD
index 24f469f9ef52..522d6fe32793 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,14 @@
 # Maintainer: Piotr Miller <nwg.piotr@gmail.com>
 pkgname=('nwg-panel')
 pkgver=0.7.4
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK3-based panel for sway window manager"
 arch=('x86_64')
 url="https://github.com/nwg-piotr/nwg-panel"
 license=('MIT')
-depends=('python' 'python-gobject' 'python-i3ipc' 'python-dasbus' 'python-netifaces' 'python-psutil' 'python-requests' 'bluez-utils' 'gtk3' 'gtk-layer-shell' 'light' 'pamixer' 'playerctl' nwg-icon-picker)
+provides=('nwg-panel')
+conflicts=('nwg-panel' 'nwg-panel-git')
+depends=('python' 'python-gobject' 'python-i3ipc' 'python-dasbus' 'python-netifaces' 'python-psutil' 'python-requests' 'bluez-utils' 'gtk3' 'gtk-layer-shell' 'light' 'pamixer' 'playerctl' 'nwg-icon-picker')
 makedepends=('python-setuptools' 'python-wheel')
 optdepends=('wlr-randr: for non-sway Wayland WMs support'
             'swaync: for Sway Notification Center support'