make normal and -git AUR packages conflict (#10)

wlrfx · Jul 6, 2024 · d7bd7db · d7bd7db
1 parent f6e33d1
commit d7bd7db
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 2 deletions.
diff --git a/aur/scenefx-git/.SRCINFO b/aur/scenefx-git/.SRCINFO
@@ -16,6 +16,8 @@ pkgbase = scenefx-git
  depends = libdrm
  depends = libpixman-1.so
  provides = libscenefx.so
+ conflicts = scenefx
+ conflicts = scenefx-git
  options = debug
  source = scenefx::git+https://github.com/wlrfx/scenefx.git
  sha512sums = SKIP

diff --git a/aur/scenefx-git/PKGBUILD b/aur/scenefx-git/PKGBUILD
@@ -23,6 +23,7 @@ makedepends=(
  "wayland-protocols"
 )
 optdepends=()
+conflicts=("scenefx" "scenefx-git")
 provides=("libscenefx.so")
 options=("debug")
 source=("${pkgname%-*}::git+${url}.git")

diff --git a/aur/scenefx/.SRCINFO b/aur/scenefx/.SRCINFO
@@ -16,6 +16,8 @@ pkgbase = scenefx
  depends = libdrm
  depends = libpixman-1.so
  provides = libscenefx.so
+ conflicts = scenefx
+ conflicts = scenefx-git
  options = debug
  source = scenefx-0.1.tar.gz::https://github.com/wlrfx/scenefx/archive/refs/tags/0.1.tar.gz
  sha512sums = SKIP

diff --git a/aur/scenefx/PKGBUILD b/aur/scenefx/PKGBUILD
@@ -23,6 +23,7 @@ makedepends=(
  "wayland-protocols"
 )
 optdepends=()
+conflicts=("scenefx" "scenefx-git")
 provides=("libscenefx.so")
 options=("debug")
 source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/$pkgver.tar.gz")

diff --git a/aur/swayfx-git/.SRCINFO b/aur/swayfx-git/.SRCINFO
@@ -47,6 +47,7 @@ pkgbase = swayfx-git
  provides = swayfx
  conflicts = sway
  conflicts = swayfx
+ conflicts = swayfx-git
  options = debug
  backup = etc/sway/config
  backup = etc/sway/config.d/50-systemd-user.conf

diff --git a/aur/swayfx-git/PKGBUILD b/aur/swayfx-git/PKGBUILD
@@ -54,7 +54,7 @@ sha512sums=(
  "d5f9aadbb4bbef067c31d4c8c14dad220eb6f3e559e9157e20e1e3d47faf2f77b9a15e52519c3ffc53dc8a5202cb28757b81a4b3b0cc5dd50a4ddc49e03fe06e"
  "4f9576b7218aef8152eb60e646985e96b13540b7a4fd34ba68fdc490199cf7a7b46bbee85587e41bffe81fc730222cf408d5712e6251edc85a0a0b0408c1a2df")
 provides=("sway" "swayfx")
-conflicts=("sway" "swayfx")
+conflicts=("sway" "swayfx" "swayfx-git")
 options=(debug)
 install=sway.install
 

diff --git a/aur/swayfx/.SRCINFO b/aur/swayfx/.SRCINFO
@@ -41,6 +41,7 @@ pkgbase = swayfx
  provides = swayfx
  conflicts = sway
  conflicts = swayfx
+ conflicts = swayfx-git
  options = debug
  backup = etc/sway/config
  source = swayfx-0.4.tar.gz::https://github.com/WillPower3309/swayfx/archive/refs/tags/0.4.tar.gz

diff --git a/aur/swayfx/PKGBUILD b/aur/swayfx/PKGBUILD
@@ -52,7 +52,7 @@ sha512sums=(
  "d5f9aadbb4bbef067c31d4c8c14dad220eb6f3e559e9157e20e1e3d47faf2f77b9a15e52519c3ffc53dc8a5202cb28757b81a4b3b0cc5dd50a4ddc49e03fe06e"
  "790741df028822bf4d83170dea57e1c63f7d7938cf31969e4cd347b0fc07330322b603c9ec0091b7a3f425132bed9dee6f261074cc273555120858beaaaf5da1")
 provides=("sway" "swayfx")
-conflicts=("sway" "swayfx")
+conflicts=("sway" "swayfx" "swayfx-git")
 options=(debug)
 install=sway.install