Date: Sunday, September 25, 2022 @ 18:30:42
  Author: heftig
Revision: 456770

2.46.0-2: add missing conflicts

Modified:
  at-spi2-core/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-09-25 18:24:56 UTC (rev 456769)
+++ PKGBUILD    2022-09-25 18:30:42 UTC (rev 456770)
@@ -4,7 +4,7 @@
 pkgbase=at-spi2-core
 pkgname=(at-spi2-core at-spi2-core-docs)
 pkgver=2.46.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 url="https://gitlab.gnome.org/GNOME/at-spi2-core";
 arch=(x86_64)
@@ -39,9 +39,12 @@
 }
 
 build() {
-  arch-meson at-spi2-core build \
-    -D default_bus=dbus-broker \
+  local meson_options=(
+    -D default_bus=dbus-broker
     -D docs=true
+  )
+
+  arch-meson at-spi2-core build "${meson_options[@]}"
   meson compile -C build
 }
 
@@ -54,15 +57,19 @@
 package_at-spi2-core() {
   optdepends=('dbus-broker: Alternative bus implementation')
   provides=(
-    at-spi2-atk
-    atk
+    "at-spi2-atk=$pkgver-$pkgrel"
+    "atk=$pkgver-$pkgrel"
     libatk-1.0.so
     libatk-bridge-2.0.so
     libatspi.so
   )
+  conflicts=(
+    'at-spi2-atk<=2.38.0-2'
+    'atk<=2.38.0-2'
+  )
   replaces=(
-    'at-spi2-atk<=2.38.0-1'
-    'atk<=2.38.0-1'
+    'at-spi2-atk<=2.38.0-2'
+    'atk<=2.38.0-2'
   )
 
   meson install -C build --destdir "$pkgdir"

Reply via email to