Conflicts with solaar

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6a9d90cf61d..7aaec87b3b10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-hid-parser
 	pkgdesc = Typed pure Python library to parse HID report descriptors
 	pkgver = 0.0.3
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/usb-tools/python-hid-parser
 	arch = any
 	license = MIT
@@ -12,6 +12,7 @@ pkgbase = python-hid-parser
 	makedepends = python-setuptools
 	makedepends = python-wheel
 	depends = python-typing_extensions
+	conflicts = solaar
 	source = https://github.com/usb-tools/python-hid-parser/archive/0.0.3/python-hid-parser-0.0.3.tar.gz
 	source = test_items.patch
 	b2sums = 00a485093ae4f1268c3e6ed8b194f1c0f1579e665863cd609a4690f292b8646ec6d51ab35f803dac7cb0185b0b837fe6ae810a7567fe96102d43e39eefb950e6
diff --git a/PKGBUILD b/PKGBUILD
index ec482b8b94d1..c880f661a8e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=python-hid-parser
 pkgver=0.0.3
-pkgrel=5
+pkgrel=6
 pkgdesc='Typed pure Python library to parse HID report descriptors'
 arch=('any')
 url='https://github.com/usb-tools/python-hid-parser'
@@ -10,6 +10,7 @@ license=('MIT')
 depends=(python-typing_extensions)
 makedepends=(python-{build,installer,setuptools,wheel})
 checkdepends=(python-{hypothesis,pytest})
+conflicts=(solaar)
 source=("https://github.com/usb-tools/python-hid-parser/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz" "test_items.patch")
 b2sums=('00a485093ae4f1268c3e6ed8b194f1c0f1579e665863cd609a4690f292b8646ec6d51ab35f803dac7cb0185b0b837fe6ae810a7567fe96102d43e39eefb950e6'
         '894d0e2f1c264096baf69a98716ffaeabac83d79544e7180721ead3067e17fe038096aa5394d6c282d5d409cf94988e2ef85a7079c4214bee7f33e173e430dac')