Updated package vmware-ovftool 4.1.0.2459827-3

2 files changed, 18 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 263469153b72..054ac75685ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
+# Generated by mksrcinfo v8
+# Sat Apr 15 16:33:59 UTC 2017
 pkgbase = vmware-ovftool
 	pkgdesc = VMware Open Virtualization Format tool
 	pkgver = 4.1.0.2459827
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.vmware.com/support/developer/ovf/
 	arch = i686
 	arch = x86_64
 	license = custom:vmware
+	makedepends = xorg-server-xvfb
 	depends = curl
-	source_i686 = https://dl.dropboxusercontent.com/u/99802211/external_sources/VMware%20OVFTool/VMware-ovftool-4.1.0-2459827-lin.i386.bundle
+	depends = libxml2
+	source_i686 = http://url.muflone.com/VMware-ovftool-4.1.0-2459827-lin.i386.bundle
 	sha256sums_i686 = cd931c83ceac41f9859e5414fafe4717a1d4a49c32b11afdf4f575ac2515eba2
-	source_x86_64 = https://dl.dropboxusercontent.com/u/99802211/external_sources/VMware%20OVFTool/VMware-ovftool-4.1.0-2459827-lin.x86_64.bundle
+	source_x86_64 = http://url.muflone.com/VMware-ovftool-4.1.0-2459827-lin.x86_64.bundle
 	sha256sums_x86_64 = a21ce600f92321a71cde5de1bb947ca9aa62d898c81cefcba4066b756b43993f
 
 pkgname = vmware-ovftool
diff --git a/PKGBUILD b/PKGBUILD
index df160d8937d8..1c5681727c69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,15 @@
 
 pkgname=vmware-ovftool
 pkgver=4.1.0.2459827
-pkgrel=2
+pkgrel=3
 pkgdesc="VMware Open Virtualization Format tool"
 arch=('i686' 'x86_64')
 url="https://www.vmware.com/support/developer/ovf/"
 license=('custom:vmware')
-depends=('curl')
-source_i686=("https://dl.dropboxusercontent.com/u/99802211/external_sources/VMware%20OVFTool/VMware-ovftool-${pkgver%.*}-${pkgver##*.}-lin.i386.bundle")
-source_x86_64=("https://dl.dropboxusercontent.com/u/99802211/external_sources/VMware%20OVFTool/VMware-ovftool-${pkgver%.*}-${pkgver##*.}-lin.x86_64.bundle")
+makedepends=('xorg-server-xvfb')
+depends=('curl' 'libxml2')
+source_i686=("http://url.muflone.com/VMware-ovftool-${pkgver%.*}-${pkgver##*.}-lin.i386.bundle")
+source_x86_64=("http://url.muflone.com/VMware-ovftool-${pkgver%.*}-${pkgver##*.}-lin.x86_64.bundle")
 sha256sums_i686=('cd931c83ceac41f9859e5414fafe4717a1d4a49c32b11afdf4f575ac2515eba2')
 sha256sums_x86_64=('a21ce600f92321a71cde5de1bb947ca9aa62d898c81cefcba4066b756b43993f')
 
@@ -27,15 +28,18 @@ prepare() {
 
 build() {
   rm -rf "${srcdir}/build"
-  sh "${srcdir}/VMware-ovftool-${pkgver%.*}-${pkgver##*.}-${CARCH}_file.bundle" -x "${srcdir}/build"
+  xvfb-run -a sh "${srcdir}/VMware-ovftool-${pkgver%.*}-${pkgver##*.}-${CARCH}_file.bundle" -x "${srcdir}/build"
+  # Remove duplicated system libraries
+  cd "${srcdir}/build/${pkgname}"
+  rm "libcurl.so.4" "libxml2.so.2"
 }
 
 package() {
   cd "${srcdir}/build/${pkgname}"
   # Install binaries files
   install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
-  install -m 644 -t "${pkgdir}/usr/lib/${pkgname}" icudt44l.dat lib*
-  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" ovftool ovftool.bin
+  install -m 644 -t "${pkgdir}/usr/lib/${pkgname}" icudt44l.dat
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}" ovftool ovftool.bin lib*
   # Install data files
   for _subdir in certs env env/en schemas/DMTF schemas/vmware
   do