summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Wu2023-07-24 04:53:48 +0800
committerWinston Wu2023-07-24 04:53:48 +0800
commit971c84be30b69779111144aa98009013f7642d5f (patch)
tree50e02f37937904b4982cec36e93a89c6df99a8c5
parentc2cd9ddd99a7656ba992ef40728258b964d41766 (diff)
downloadaur-971c84be30b69779111144aa98009013f7642d5f.tar.gz
Add conflict
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bdcb2bc667ab..5016564cb590 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = virtualbox-svn
pkgver = 100670
- pkgrel = 2
+ pkgrel = 3
url = http://virtualbox.org
arch = x86_64
license = GPL
@@ -165,6 +165,7 @@ pkgname = virtualbox-guest-utils-svn
conflicts = virtualbox-guest-utils-nox
conflicts = virtualbox-guest-utils
conflicts = virtualbox-guest-dkms
+ conflicts = virtualbox-guest-dkms-svn
replaces = virtualbox-archlinux-additions
replaces = virtualbox-guest-additions
replaces = virtualbox-guest-dkms-svn
@@ -178,6 +179,7 @@ pkgname = virtualbox-guest-utils-nox-svn
conflicts = virtualbox-guest-utils
conflicts = virtualbox-guest-utils-nox
conflicts = virtualbox-guest-dkms
+ conflicts = virtualbox-guest-dkms-svn
replaces = virtualbox-guest-dkms-svn
pkgname = virtualbox-ext-vnc-svn
diff --git a/PKGBUILD b/PKGBUILD
index 5cc91b47030d..7e42bba7e9cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('virtualbox-svn'
'virtualbox-ext-vnc-svn')
pkgver=100670
_tarver=${pkgver}
-pkgrel=2
+pkgrel=3
arch=('x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom:CDDL')
@@ -279,7 +279,7 @@ package_virtualbox-guest-utils-svn() {
'xf86-video-vmware' 'VIRTUALBOX-GUEST-MODULES')
replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-dkms-svn')
provides=('virtualbox-guest-utils')
- conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-utils-nox' 'virtualbox-guest-utils' 'virtualbox-guest-dkms')
+ conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-utils-nox' 'virtualbox-guest-utils' 'virtualbox-guest-dkms' 'virtualbox-guest-dkms-svn')
source "VirtualBox/env.sh"
pushd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
@@ -307,7 +307,7 @@ package_virtualbox-guest-utils-nox-svn() {
depends=('glibc' 'pam' 'VIRTUALBOX-GUEST-MODULES')
replaces=('virtualbox-guest-dkms-svn')
provides=('virtualbox-guest-utils-nox')
- conflicts=('virtualbox-guest-utils' 'virtualbox-guest-utils-nox' 'virtualbox-guest-dkms')
+ conflicts=('virtualbox-guest-utils' 'virtualbox-guest-utils-nox' 'virtualbox-guest-dkms' 'virtualbox-guest-dkms-svn')
source "VirtualBox/env.sh"
pushd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"