summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marc Lenoir2019-03-16 11:41:18 +0100
committerJean-Marc Lenoir2019-03-16 11:41:18 +0100
commitf8d90f5af1fcb28044f81bb92b78f0032fad1f7a (patch)
tree157b26874d2d33a840a2b360ae1f4f4d5786d2db
parentaf18c4140fc526fc6ec548679cf86c07981726f9 (diff)
downloadaur-f8d90f5af1fcb28044f81bb92b78f0032fad1f7a.tar.gz
Use xkeymap files from vmware-keymaps package to avoid conflicts with vmware-horizon package
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a85e46b4fdff..ae677beccb73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vmware-workstation11
pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC.
pkgver = 11.1.4
- pkgrel = 5
+ pkgrel = 6
url = https://www.vmware.com/products/workstation-for-linux.html
install = vmware-workstation.install
arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = vmware-workstation11
makedepends = sqlite
makedepends = python2
makedepends = unzip
+ depends = vmware-keymaps
depends = dkms
depends = ncurses5-compat-libs
depends = fuse2
diff --git a/PKGBUILD b/PKGBUILD
index 026a4f20f6d6..87f3c8544f34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ pkgname=vmware-workstation11
pkgver=11.1.4
_buildver=3848939
_pkgver=${pkgver}_${_buildver}
-pkgrel=5
+pkgrel=6
pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.'
arch=(x86_64)
url='https://www.vmware.com/products/workstation-for-linux.html'
@@ -34,6 +34,7 @@ provides=(
vmware-ovftool
)
depends=(
+ vmware-keymaps
dkms
ncurses5-compat-libs
fuse2
@@ -239,7 +240,6 @@ package() {
cp -rL \
vmware-workstation-server/config/etc/vmware/* \
vmware-workstation-server/etc/vmware/* \
- "$srcdir"/{bootstrap,config} \
"$pkgdir/etc/vmware"
cp -r \
@@ -293,6 +293,9 @@ package() {
install -Dm 644 vmware-vmx/extra/modules.xml "$pkgdir/usr/lib/vmware/modules/modules.xml"
install -Dm 644 vmware-installer/bootstrap "$pkgdir/etc/vmware-installer/bootstrap"
install -Dm 644 "$srcdir/vmware-vix-bootstrap" "$pkgdir/etc/vmware-vix/bootstrap"
+ install -Dm 644 "$srcdir"/{bootstrap,config} "$pkgdir/etc/vmware"
+
+ rm -r "$pkgdir/usr/lib/vmware/xkeymap" # these files are now provided by vmware-keymaps package
for hostd_file in config datastores environments proxy vmAutoStart; do
install -Dm 644 "$srcdir/$hostd_file.xml" "$pkgdir/etc/vmware/hostd/$hostd_file.xml"