summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorShohei Maruyama2023-08-06 14:25:14 +0900
committerShohei Maruyama2023-08-06 14:25:14 +0900
commit8794c09e36434fc90f04cec518b4dc0e0cd737cb (patch)
tree155449a53043ef9acd5c2d5c6d8767c235d300d7
parent99cb8ceced6d441b5aba879463bac3e9ff86d28b (diff)
downloadaur-8794c09e36434fc90f04cec518b4dc0e0cd737cb.tar.gz
Revert "PKGBUILD: Remove the package's own name from 'conflicts'"
This reverts commit f09ad05fdfceaf7fc359a9ba977011cb7709dcd0.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 82252dbe57f5..2ed4663a5517 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = webvirtcloud-git
pkgdesc = WebVirtCloud is virtualization web interface for admins and users
pkgver = 20230711.1220.82de7f4
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/retspen/webvirtcloud
install = webvirtcloud-git.install
arch = x86_64
@@ -29,6 +29,8 @@ pkgbase = webvirtcloud-git
depends = python-markdown
provides = webvirtcloud
provides = webvirtcloud-git
+ conflicts = webvirtcloud
+ conflicts = webvirtcloud-git
conflicts = webvirtmgr
conflicts = webvirtmgr-git
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 735ee9da0c65..e72da36e02a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_gitname="webvirtcloud"
pkgname=("${_gitname}-git")
pkgver=20230711.1220.82de7f4
-pkgrel=3
+pkgrel=4
pkgdesc="WebVirtCloud is virtualization web interface for admins and users"
arch=("x86_64")
url="https://github.com/retspen/webvirtcloud"
@@ -34,7 +34,7 @@ depends=(
)
makedepends=("git")
provides=("webvirtcloud" "webvirtcloud-git")
-conflicts=("webvirtmgr" "webvirtmgr-git")
+conflicts=("webvirtcloud" "webvirtcloud-git" "webvirtmgr" "webvirtmgr-git")
options=("!strip" "!emptydirs")
install="${pkgname}.install"
source=("${_gitname}::git+https://github.com/retspen/webvirtcloud.git"