update to 7.34.7.494

3 files changed, 37 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 750417d88cc7..48f4919b4758 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-wine-welink
 	pkgdesc = 华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。
-	pkgver = 7.33.6
+	pkgver = 7.34.7.494
 	pkgrel = 1
 	url = https://www.huaweicloud.com/product/welink.html
 	install = deepin-wine-welink.install
@@ -15,16 +15,16 @@ pkgbase = deepin-wine-welink
 	conflicts = welink
 	conflicts = huaweicloudmeeting
 	source = com.huaweicloud.welink.spark_7.21.3.403spark1.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/com.huaweicloud.welink.spark/com.huaweicloud.welink.spark_7.21.3.403spark1_i386.deb
-	source = WeLink-7.33.6.exe::https://welink.huaweicloud.com/download/WeLink_setup.exe
+	source = WeLink-7.34.7.494.exe::https://welink.huaweicloud.com/download/WeLink_setup.exe
 	source = fake_simsun.ttc::https://images.xuthus.cc/images/fake_simsun.ttc
 	source = deepin-wine-welink.install
 	source = LICENSE.html::https://www.huaweicloud.com/declaration/sa_cua_computing.html
-	source = run.sh
+	source = deepin-wine-welink.sh
 	sha256sums = 2a5046177ad2f57ebeff4176ffe4ae2717eed19c8fd2e84fad5b9f44305d16d1
-	sha256sums = 92c6ad40c18373ff4f16ca626aeca801f7945c1b70bb563fb8cf31267e82ddab
+	sha256sums = 61e9ba5c507910515aceecb53b48faa736282cbd795456e81484f831ea933ddc
 	sha256sums = 3e2ed9203a5ce3b2f00b6c942d8fac6b24e7a6e7b1ebc863cee2e27d3ff487db
 	sha256sums = d3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a
-	sha256sums = 04e1034593bc78727012888ec91391bf953e80061114c491ef1575bb981d5050
-	sha256sums = a61180b631514e035828c7e7cfcdfb8e785d976b8ca56ea8532248fd8988565c
+	sha256sums = 8870de1e48191faf4312f01d0478816ae6e69992e3e4b5b90ac2c3bac8a85060
+	sha256sums = 2c45cb8522c79d8746aa987869753e34723a39073e0eebb45900880c8f168daa
 
 pkgname = deepin-wine-welink
diff --git a/PKGBUILD b/PKGBUILD
index bc3a62c6e0ac..b63142bb07da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,33 +3,48 @@ _pkgname=welink
 pkgname="deepin-wine-${_pkgname}"
 _sparkname="com.huaweicloud.${_pkgname}.spark"
 _appname=WeLink
-pkgver=7.33.6
+pkgver=7.34.7.494
 _sparkver=7.21.3.403spark1
 pkgrel=1
 pkgdesc="华为数字化办公实践,服务政企、高校等主要客户,是全场景安全、智能、的数字化办公平台,帮助AnyBody、AnyWhere、AnyDevice、doAnyBusiness4A办公。"
 arch=("x86_64")
 url="https://www.huaweicloud.com/product/welink.html"
 license=('custom')
-depends=('deepin-wine6-stable' 'spark-dwine-helper' 'xdg-utils' 'sh')
-makededpends=('p7zip')
-optdepends=('wqy-microhei' 'wqy-zenhei')
-conflicts=("${_pkgname}" "huaweicloudmeeting")
+depends=(
+    'deepin-wine6-stable'
+    'spark-dwine-helper'
+    'xdg-utils'
+    'sh'
+)
+makededpends=(
+    'p7zip'
+)
+optdepends=(
+    'wqy-microhei'
+    'wqy-zenhei'
+)
+conflicts=(
+    "${_pkgname}"
+    "huaweicloudmeeting"
+)
 install="${pkgname}.install"
-source=("${_sparkname}_${_sparkver}.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/${_sparkname}/${_sparkname}_${_sparkver}_i386.deb"
+source=(
+    "${_sparkname}_${_sparkver}.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/chat/${_sparkname}/${_sparkname}_${_sparkver}_i386.deb"
     "${_appname}-${pkgver}.exe::https://welink.huaweicloud.com/download/${_appname}_setup.exe"
     "fake_simsun.ttc::https://images.xuthus.cc/images/fake_simsun.ttc"
     "${pkgname}.install"
     "LICENSE.html::https://www.huaweicloud.com/declaration/sa_cua_computing.html"
-    "run.sh")
+    "${pkgname}.sh"
+)
 sha256sums=('2a5046177ad2f57ebeff4176ffe4ae2717eed19c8fd2e84fad5b9f44305d16d1'
-            '92c6ad40c18373ff4f16ca626aeca801f7945c1b70bb563fb8cf31267e82ddab'
+            '61e9ba5c507910515aceecb53b48faa736282cbd795456e81484f831ea933ddc'
             '3e2ed9203a5ce3b2f00b6c942d8fac6b24e7a6e7b1ebc863cee2e27d3ff487db'
             'd3f310b0d94bc630700afec6d0786edc1176ca28def75b518167deba1965288a'
-            '04e1034593bc78727012888ec91391bf953e80061114c491ef1575bb981d5050'
-            'a61180b631514e035828c7e7cfcdfb8e785d976b8ca56ea8532248fd8988565c')
+            '8870de1e48191faf4312f01d0478816ae6e69992e3e4b5b90ac2c3bac8a85060'
+            '2c45cb8522c79d8746aa987869753e34723a39073e0eebb45900880c8f168daa')
 build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
-    mv "${srcdir}/opt/${_sparkname}" "${srcdir}/opt/${pkgname}"
+    mv "${srcdir}/opt/apps/${_sparkname}" "${srcdir}/opt/apps/${pkgname}"
     mkdir -p "${srcdir}/tmp"
     msg "Extracting Deepin Wine ${_appname} archive ..."
     7z x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"     
@@ -44,14 +59,14 @@ build() {
     sed -e "s|chat|Network|g" \
         -e "s|/opt/apps/${_sparkname}/entries/icons/hicolor/scalable/apps/${_sparkname}.png|${pkgname}|g" \
         -e "s|\"/opt/apps/${_sparkname}/files/run.sh\"|${pkgname}|g" \
-        -i "${srcdir}/opt/apps/${_sparkname}/entries/applications/${_sparkname}.desktop"
+        -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${_sparkname}.desktop"
     rm -rf "${srcdir}/opt/apps/${pkgname}/info"
 }
 package() {
     cp -r "${srcdir}/opt" "${pkgdir}"
     md5sum "${pkgdir}/opt/apps/${pkgname}/files/files.7z" | awk '{ print $1 }' > "${pkgdir}/opt/apps/${pkgname}/files/files.md5sum"
-    install -Dm644 "${srcdir}/opt/apps/${_sparkname}/entries/applications/${_sparkname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-    install -Dm644 "${srcdir}/opt/apps/${_sparkname}/entries/icons/hicolor/scalable/apps/${_sparkname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -Dm755 "${srcdir}/run.sh" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "${srcdir}/opt/apps/${pkgname}/entries/applications/${_sparkname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm644 "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_sparkname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
     install -Dm644 "${srcdir}/LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/run.sh b/deepin-wine-welink.sh
index 1620d07fdd8b..8b670c2302c7 100644
--- a/run.sh
+++ b/deepin-wine-welink.sh
@@ -8,7 +8,7 @@
 #               Vufa <countstarlight@gmail.com>
  
 BOTTLENAME="Deepin-WeLink"
-APPVER="7.33.6"
+APPVER="7.34.7.494"
 WELINK_INSTALLER="WeLink"
 WELINK_VER="7.28.8.455"
 WELINK_INSTALLER_PATH="c:/Program Files/WeLink/${WELINK_INSTALLER}-${WELINK_VER}.exe"