[arch-commits] Commit in qemu/trunk (PKGBUILD)

[David Runge]

    Date: Wednesday, April 27, 2022 @ 22:04:49
  Author: dvzrv
Revision: 444163

upgpkg: qemu 7.0.0-7: Rebuild to add conflicts for meta packages.

Add conflicts on qemu to meta packages providing qemu, so that they can properly replace qemu<7 when upgrading.

Modified:
  qemu/trunk/PKGBUILD

----------+
 PKGBUILD |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-27 22:01:18 UTC (rev 444162)
+++ PKGBUILD	2022-04-27 22:04:49 UTC (rev 444163)
@@ -25,7 +25,7 @@
   qemu-{base,desktop,emulators-full,full}
 )
 pkgver=7.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc="A generic and open source machine emulator and virtualizer"
 arch=(x86_64)
 url="https://www.qemu.org/"
@@ -940,7 +940,7 @@
   )
   optdepends=("${_qemu_optdepends[@]}")
   # TODO: remove conflicts/provides/replaces for qemu-headless after 2022-10-01
-  conflicts=(qemu-headless)
+  conflicts=(qemu qemu-headless)
   provides=(qemu=$pkgver qemu-headless)
   replaces=(qemu-headless)
 }
@@ -965,6 +965,7 @@
     qemu-virtiofsd
   )
   optdepends=("${_qemu_optdepends[@]}")
+  conflicts=(qemu)
   provides=(qemu=$pkgver)
   replaces=('qemu<7')
 }
@@ -1003,6 +1004,7 @@
     qemu-virtiofsd
   )
   optdepends=("${_qemu_optdepends[@]}")
+  conflicts=(qemu)
   provides=(qemu=$pkgver)
 }