summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marc Lenoir2019-03-16 11:14:54 +0100
committerJean-Marc Lenoir2019-03-16 11:14:54 +0100
commit17865db5ed74fe31b7889b7b426144e7cf7480fb (patch)
tree2a187e38e13f691c529374d9e9dacb792d741e97
parentaa647ebd8e35424d7c810f151e04db4a76d4d095 (diff)
downloadaur-17865db5ed74fe31b7889b7b426144e7cf7480fb.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 47a50838111..dca7d429514 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vmware-workstation14
pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC.
pkgver = 14.1.5
- pkgrel = 2
+ pkgrel = 3
url = https://www.vmware.com/products/workstation-for-linux.html
install = vmware-workstation.install
arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = vmware-workstation14
makedepends = sqlite
makedepends = python2
makedepends = unzip
+ depends = vmware-keymaps
depends = dkms
depends = ncurses5-compat-libs
depends = fuse2
diff --git a/PKGBUILD b/PKGBUILD
index 7cd172c6c19..53368ce7592 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ pkgname=vmware-workstation14
pkgver=14.1.5
_buildver=10950780
_pkgver=${pkgver}_${_buildver}
-pkgrel=2
+pkgrel=3
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
@@ -241,7 +242,6 @@ package() {
cp -rL \
vmware-workstation-server/config/etc/vmware/* \
vmware-workstation-server/etc/vmware/* \
- "$srcdir"/{bootstrap,config} \
"$pkgdir/etc/vmware"
cp -r \
@@ -296,6 +296,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"