svclient 1.2.0

3 files changed, 30 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 728a4e12e9a8..d55ea3e3a43e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,6 @@
 pkgbase = svclient
-	pkgver = 1.1.0
+	pkgdesc = kylin software VPN
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://github.com/dingjingmaster/svclient
 	arch = x86_64
@@ -7,8 +8,8 @@ pkgbase = svclient
 	makedepends = git
 	makedepends = qt5-base
 	depends = qt5-base
-	source = https://github.com/dingjingmaster/svclient/archive/1.1.0.tar.gz
-	sha256sums = 19212d6669cdf69aa812f6a1cfe9ef2238e7f4c0053c0f7b58baac4b5e046c6b
+	source = https://github.com/dingjingmaster/svclient/archive/1.2.0.tar.gz
+	sha256sums = 9ba977096c95237318588d1926d721be5b838f5d8febe378ee30412b87dac941
 
 pkgname = svclient
 
diff --git a/PKGBUILD b/PKGBUILD
index b0e2c77d1f06..579e388b36f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,12 @@
 _server=cpx51
 pkgbase=svclient
 pkgname=('svclient')
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 arch=('x86_64')
 url="https://github.com/dingjingmaster/svclient"
 license=('MIT')
+pkgdesc="kylin software VPN"
 depends=(
     'qt5-base'
 )
@@ -19,7 +20,7 @@ source=(
     "https://github.com/dingjingmaster/svclient/archive/${pkgver}.tar.gz"
 )
 sha256sums=(
-    "19212d6669cdf69aa812f6a1cfe9ef2238e7f4c0053c0f7b58baac4b5e046c6b"
+    "9ba977096c95237318588d1926d721be5b838f5d8febe378ee30412b87dac941"
 )
 
 prepare() {
@@ -36,22 +37,22 @@ package_svclient() {
     install -dm755 "${pkgdir}/usr/lib/"
     install -dm755 "${pkgdir}/usr/share/"
     install -dm755 "${pkgdir}/usr/share/applications"
-    install -dm755 "${pkgdir}/etc/systemd/system"
+    install -dm755 "${pkgdir}/usr/lib/systemd/user/"
 
-    install -Dm655 ${srcdir}/svclient-1.1.0/vpn/svclient/sslvpn            "${pkgdir}/usr/share/svclient/sslvpn"
-    install -Dm655 ${srcdir}/svclient-1.1.0/vpn/svclient/svclient          "${pkgdir}/usr/share/svclient/svclient"
-    install -Dm655 ${srcdir}/svclient-1.1.0/vpn/svclient/SVClient.png      "${pkgdir}/usr/share/svclient/SVClient.png"
-    install -Dm655 ${srcdir}/svclient-1.1.0/vpn/svclient/SVClient_linux    "${pkgdir}/usr/share/svclient/SVClient_linux"
+    install -Dm655 ${srcdir}/svclient-1.2.0/vpn/svclient/sslvpn            "${pkgdir}/usr/share/svclient/sslvpn"
+    install -Dm655 ${srcdir}/svclient-1.2.0/vpn/svclient/svclient          "${pkgdir}/usr/share/svclient/svclient"
+    install -Dm655 ${srcdir}/svclient-1.2.0/vpn/svclient/SVClient.png      "${pkgdir}/usr/share/svclient/SVClient.png"
+    install -Dm655 ${srcdir}/svclient-1.2.0/vpn/svclient/SVClient_linux    "${pkgdir}/usr/share/svclient/SVClient_linux"
 
-    install -Dm655 ${srcdir}/svclient-1.1.0/vpn/svclient/svmgrsh           "${pkgdir}/usr/share/svclient/svmgrash"
-    install -Dm655 ${srcdir}/svclient-1.1.0/vpn/svclient/svmgrsvc          "${pkgdir}/usr/share/svclient/svmgrsvc"
-    install -Dm655 ${srcdir}/svclient-1.1.0/vpn/svclient/svmonitor         "${pkgdir}/usr/share/svclient/svmonitor"
-    install -Dm655 ${srcdir}/svclient-1.1.0/vpn/svclient/svmonitorsh       "${pkgdir}/usr/share/svclient/svmonitorsh"
+    install -Dm655 ${srcdir}/svclient-1.2.0/vpn/svclient/svmgrsh           "${pkgdir}/usr/share/svclient/svmgrash"
+    install -Dm655 ${srcdir}/svclient-1.2.0/vpn/svclient/svmgrsvc          "${pkgdir}/usr/share/svclient/svmgrsvc"
+    install -Dm655 ${srcdir}/svclient-1.2.0/vpn/svclient/svmonitor         "${pkgdir}/usr/share/svclient/svmonitor"
+    install -Dm655 ${srcdir}/svclient-1.2.0/vpn/svclient/svmonitorsh       "${pkgdir}/usr/share/svclient/svmonitorsh"
 
-    install -Dm755 ${srcdir}/svclient-1.1.0/vpn/usr-lib/*                  "${pkgdir}/usr/lib/"
-    install -Dm755 ${srcdir}/svclient-1.1.0/vpn/usr-share-applications/*   "${pkgdir}/usr/share/applications/"
+    install -Dm755 ${srcdir}/svclient-1.2.0/vpn/usr-lib/*                  "${pkgdir}/usr/lib/"
+    install -Dm755 ${srcdir}/svclient-1.2.0/vpn/usr-share-applications/*   "${pkgdir}/usr/share/applications/"
 
-    install -Dm755 ${srcdir}/svclient-1.1.0/vpn/etc-systemd-system/*       "${pkgdir}/etc/systemd/system/"
+    install -Dm755 ${srcdir}/svclient-1.2.0/vpn/usr-lib-systemd-user/*     "${pkgdir}/usr/lib/systemd/user/"
 
     install -Dm644 ../../README.md                  "${pkgdir}/usr/share/doc/${pkgname}/README"
     install -Dm644 ../../LICENSE                    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/svclient.install b/svclient.install
index 7b9c6bae0808..b49fcfff858e 100644
--- a/svclient.install
+++ b/svclient.install
@@ -1,11 +1,14 @@
 pre_install() {
-    systemctl stop svclient
+    systemctl stop svmgrsvc
+    systemctl stop svmonitor
 }
 
 
 post_install() {
-    systemctl start svclient
-    systemctl enable svclient
+    systemctl stop svmgrsvc
+    systemctl enable svmgrsvc
+    systemctl stop svmonitor
+    systemctl enable svmonitor
 }
 
 pre_upgrade() {
@@ -15,8 +18,10 @@ post_upgrade() {
 }
 
 pre_remove() {
-    systemctl stop svclient
-    systemctl disable svclient
+    systemctl stop svmgrsvc
+    systemctl disable svmgrsvc
+    systemctl stop svmonitor
+    systemctl disable svmonitor
 }
-pre_remove() {
+post_remove() {
 }