Change dependencies, fix copyright and remove the wrapper

- [x] Changed `libcurl-compat` from the dependencies,
- [x] Fixed copyright notice to have 2018 (as per license),
- [x] Removed the wrapper.

3 files changed, 6 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d57c18a69ab..eaff72b03774 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = vpn-unlimited
 	pkgdesc = VPN Unlimited client application
 	pkgver = 7.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.vpnunlimitedapp.com
 	arch = x86_64
-	license = custom:"Copyright (c) 2017 KeepSolid Inc."
+	license = custom:"Copyright (c) 2018 KeepSolid Inc."
 	depends = glibc>=2.9
 	depends = qt5-base>=5.2.1
 	depends = qt5-script>=5.2.1
@@ -14,17 +14,14 @@ pkgbase = vpn-unlimited
 	depends = openvpn
 	depends = openresolv
 	depends = lzo>=2.0
-	depends = libcurl-compat
 	depends = iproute
 	depends = net-tools
 	depends = c-ares>=1.10.0
 	depends = lsb-release
 	depends = strongswan>=5.8.1
 	depends = qt5-webengine>=5.2.1
-	source_x86_64 = vpn-unlimited
 	source_x86_64 = vpn-unlimited-daemon.service
 	source_x86_64 = http://apt.keepsolid.com/deb/dists/stable/main/binary-amd64/vpn_unlimited_v7.0_amd64.deb
-	sha256sums_x86_64 = b34f3093c4036e571117fd48791f52f8ece946ede7273758ef60bff294cba98f
 	sha256sums_x86_64 = dd5ba49842bcbf4c5f722bac2ab3d4c919c676bc29c1ca269678e8a53c0e6a41
 	sha256sums_x86_64 = 9d7f72353256a2e26843dcaa317440e0b14c61be8f0c48466a7ce65223aec908
 
diff --git a/PKGBUILD b/PKGBUILD
index 1e38f5f9de10..5df013b1d5e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,18 @@
 
 pkgname=vpn-unlimited
 pkgver=7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN Unlimited client application"
 arch=("x86_64")
 url="https://www.vpnunlimitedapp.com"
-license=('custom:"Copyright (c) 2017 KeepSolid Inc."')
+license=('custom:"Copyright (c) 2018 KeepSolid Inc."')
 
 source_x86_64=(
-  "vpn-unlimited"
   "vpn-unlimited-daemon.service"
   "http://apt.keepsolid.com/deb/dists/stable/main/binary-amd64/vpn_unlimited_v7.0_amd64.deb"
 )
 
 sha256sums_x86_64=(
-  "b34f3093c4036e571117fd48791f52f8ece946ede7273758ef60bff294cba98f"
   "dd5ba49842bcbf4c5f722bac2ab3d4c919c676bc29c1ca269678e8a53c0e6a41"
   "9d7f72353256a2e26843dcaa317440e0b14c61be8f0c48466a7ce65223aec908"
 )
@@ -23,8 +21,8 @@ sha256sums_x86_64=(
 depends=(
   "glibc>=2.9" "qt5-base>=5.2.1" "qt5-script>=5.2.1" "qt5-webkit>=5.2.1"
   "gcc-libs>=4.4.15" "zlib>=1.2.0" "openvpn" "openresolv" "lzo>=2.0"
-  "libcurl-compat" "iproute" "net-tools" "c-ares>=1.10.0" "lsb-release"
-  "strongswan>=5.8.1" "qt5-webengine>=5.2.1"
+  "iproute" "net-tools" "c-ares>=1.10.0" "lsb-release" "strongswan>=5.8.1"
+  "qt5-webengine>=5.2.1"
 )
 
 package() {
@@ -44,10 +42,6 @@ package() {
   find "${pkgdir}/usr/sbin" -type f -exec mv '{}' "${pkgdir}/usr/bin/" \;
   rmdir "${pkgdir}/usr/sbin"
 
-  # Copy the wrapper file
-  mv "${pkgdir}/usr/bin/vpn-unlimited" "${pkgdir}/usr/share/vpn-unlimited/"
-  install -Dm755 "${srcdir}/vpn-unlimited" "${pkgdir}/usr/bin/vpn-unlimited"
-
   # Copy the license file
   install -Dm644 "${pkgdir}/usr/share/doc/vpn-unlimited/copyright" \
     "${pkgdir}/usr/share/licenses/vpn-unlimited/copyright"
diff --git a/vpn-unlimited b/vpn-unlimited
deleted file mode 100644
index ac4bd78f0fda..000000000000
--- a/vpn-unlimited
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export LD_PRELOAD=libcurl-openssl-1.0.so
-/usr/share/vpn-unlimited/vpn-unlimited "$@"