summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXenhat Hex2022-01-17 03:19:30 -0500
committerXenhat Hex2022-01-17 03:19:30 -0500
commit376041e9d80ddef6f580df2d48e2400c5641b385 (patch)
tree8b6d0072f4b2727d7dcabda526cc4f9afa0d2dbf
parent8d7375036e58e8b35aa6acfd9e5eda6991b7f49a (diff)
downloadaur-376041e9d80ddef6f580df2d48e2400c5641b385.tar.gz
update conflicts
-rw-r--r--.SRCINFO3
-rwxr-xr-xPKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aa54b965495d..29b60450c426 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = alchemy-next-viewer-git
pkgdesc = This is the next generation of Alchemy Viewer! - Git Source build
- pkgver = 6.5.2.48000.fb451f141d
+ pkgver = 6.5.2.48005.c0f6ab8dca
pkgrel = 1
url = https://www.alchemyviewer.org
arch = x86_64
@@ -40,6 +40,7 @@ pkgbase = alchemy-next-viewer-git
provides = alchemy-viewer
provides = secondlife
conflicts = alchemy-next-viewer
+ conflicts = alchemy-viewer
replaces = alchemy-next-viewer
source = alchemy-next-viewer-git::git+https://git.alchemyviewer.org/alchemy/alchemy-next.git#branch=main
source = alchemy-next.desktop
diff --git a/PKGBUILD b/PKGBUILD
index aca867dbf452..1f4a866836e8 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=alchemy-next-viewer-git
-pkgver=6.5.2.48000.fb451f141d
+pkgver=6.5.2.48005.c0f6ab8dca
pkgrel=1
_branch="${AL_GIT_BRANCH:=main}"
pkgdesc="This is the next generation of Alchemy Viewer! - Git Source build"
@@ -22,7 +22,7 @@ optdepends=(
'nvidia-libgl: NVIDIA support'
'nvidia-utils: NVIDIA support')
makedepends=('cmake' 'gcc' 'python-virtualenv' 'python-pip' 'git' 'boost' 'xz' 'ninja')
-conflicts=('alchemy-next-viewer')
+conflicts=('alchemy-next-viewer' 'alchemy-viewer')
provides=('alchemy-next' 'alchemy-viewer' 'secondlife')
replaces=('alchemy-next-viewer')
source=("$pkgname"::'git+https://git.alchemyviewer.org/alchemy/alchemy-next.git#branch=main' 'alchemy-next.desktop')