adding conflicts with qemu official meta-packages

2 files changed, 10 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c58118ef573..bd67db8c4ce5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qemu-git
 	pkgdesc = A generic and open source machine emulator and virtualizer. Git version.
-	pkgver = 7.0.0.r695.g1fba9dc71a
+	pkgver = 7.0.0.r1245.g58b53669e8
 	pkgrel = 1
 	epoch = 16
 	url = https://wiki.qemu.org/
@@ -159,6 +159,7 @@ pkgname = qemu-git
 	provides = qemu
 	conflicts = qemu-headless
 	conflicts = qemu
+	conflicts = qemu-desktop
 	replaces = qemu-kvm
 
 pkgname = qemu-headless-git
@@ -225,6 +226,7 @@ pkgname = qemu-headless-git
 	provides = qemu
 	conflicts = qemu-headless
 	conflicts = qemu
+	conflicts = qemu-base
 	replaces = qemu-kvm
 
 pkgname = qemu-arch-extra-git
@@ -271,6 +273,7 @@ pkgname = qemu-arch-extra-git
 	optdepends = edk2-ovmf: for ia32 and x64 UEFI support
 	provides = qemu-arch-extra
 	conflicts = qemu-arch-extra
+	conflicts = qemu-emulators-full
 	options = !strip
 
 pkgname = qemu-headless-arch-extra-git
@@ -317,6 +320,7 @@ pkgname = qemu-headless-arch-extra-git
 	optdepends = edk2-ovmf: for ia32 and x64 UEFI support
 	provides = qemu-headless-arch-extra
 	conflicts = qemu-headless-arch-extra
+	conflicts = qemu-emulators-full
 	options = !strip
 
 pkgname = qemu-block-iscsi-git
diff --git a/PKGBUILD b/PKGBUILD
index 5f8302531937..3572fa321a82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ pkgname=(
   qemu-guest-agent-git
 )
 pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
-pkgver=7.0.0.r695.g1fba9dc71a
+pkgver=7.0.0.r1245.g58b53669e8
 pkgrel=1
 epoch=16
 arch=(i686 x86_64)
@@ -200,7 +200,7 @@ package_qemu-git() {
     'brltty: for braille device support'
     'qemu-arch-extra-git: extra architectures support'
   )
-  conflicts=('qemu-headless' 'qemu')
+  conflicts=('qemu-headless' 'qemu' 'qemu-desktop')
   provides=('qemu-headless' 'qemu')
   replaces=(qemu-kvm)
 
@@ -247,7 +247,7 @@ package_qemu-headless-git() {
     zstd libzstd.so
   )
   optdepends=('qemu-headless-arch-extra-git: extra architectures support')
-  conflicts=('qemu-headless' 'qemu')
+  conflicts=('qemu-headless' 'qemu' 'qemu-base')
   provides=('qemu-headless' 'qemu')
   replaces=(qemu-kvm)
 
@@ -370,7 +370,7 @@ package_qemu-arch-extra-git() {
   )
   options=(!strip)
   provides=(qemu-arch-extra)
-  conflicts=(qemu-arch-extra)
+  conflicts=(qemu-arch-extra qemu-emulators-full)
 
   mv -v "$srcdir/$_gitname/extra-arch-full/usr" "$pkgdir"
 }
@@ -408,7 +408,7 @@ package_qemu-headless-arch-extra-git() {
     'edk2-ovmf: for ia32 and x64 UEFI support'
   )
   options=(!strip)
-  conflicts=(qemu-headless-arch-extra)
+  conflicts=(qemu-headless-arch-extra qemu-emulators-full)
   provides=(qemu-headless-arch-extra)
 
   mv -v "$srcdir/$_gitname/extra-arch-headless/usr" "$pkgdir"