From c251e0a481cf7163265062807d6aa523f4eeeaad Mon Sep 17 00:00:00 2001
From: wildlife <admin@lanseyujie.com>
Date: Fri, 8 Nov 2024 15:19:36 +0800
Subject: [PATCH] chore: upgrade dingtalk and wechat

---
 SOURCES/.gitignore  |  1 +
 SPECS/dingtalk.spec | 11 +++++++++--
 SPECS/wechat.spec   | 11 +++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/SOURCES/.gitignore b/SOURCES/.gitignore
index c00df13..7fcc085 100644
--- a/SOURCES/.gitignore
+++ b/SOURCES/.gitignore
@@ -1 +1,2 @@
 *.deb
+*.rpm
diff --git a/SPECS/dingtalk.spec b/SPECS/dingtalk.spec
index 4b9d250..5193b0a 100644
--- a/SPECS/dingtalk.spec
+++ b/SPECS/dingtalk.spec
@@ -5,7 +5,7 @@
 
 # https://dtapp-pub.dingtalk.com/dingtalk-desktop/xc_dingtalk_update/linux_deb/Update/other/amd64/linux_dingtalk_update_package_gray.json
 Name:           dingtalk
-Version:        7.5.20.40605
+Version:        7.6.15.4102301
 Release:        1%{?dist}
 Summary:        dingtalk
 License:        Proprietary
@@ -28,7 +28,7 @@ Requires:       libstdc++.so.6()(64bit)
 dpkg -X %{S:0} %{_builddir}/%{name}-%{version}
 
 %build
-rm -rf %{_builddir}/%{name}-%{version}/opt/apps/com.alibabainc.dingtalk/files/*Release*/{libm.so*,libstdc++.so*}
+rm -rf %{_builddir}/%{name}-%{version}/opt/apps/com.alibabainc.dingtalk/files/*Release*/{libm.so*,libstdc++.so*,libharfbuzz.so*,libGLX.so*,libGLdispatch.so*}
 
 %install
 install -d %{buildroot}/opt/dingtalk
@@ -46,6 +46,13 @@ install -Dm755 %{S:3} -t %{buildroot}%{_bindir}
 /opt/dingtalk/
 
 %changelog
+* Fri Nov 8 2024 nobody <nobody@nobody.com> - 7.6.15.4102301
+  -【功能】组织面板升级
+  -【功能】合并转发支持更多消息种类，可嵌套
+  -【功能】支持存储空间管理
+  -【问题】支持主窗口拖出屏幕
+  -【问题】修复若干 bug & 稳定性问题
+
 * Thu Jun 13 2024 nobody <nobody@nobody.com> - 7.5.20.40605
   -【功能】左侧导航栏功能入口开放
   -【兼容性】剪切板卡顿问题修复
diff --git a/SPECS/wechat.spec b/SPECS/wechat.spec
index 3a51617..afceb45 100644
--- a/SPECS/wechat.spec
+++ b/SPECS/wechat.spec
@@ -4,18 +4,18 @@
 %undefine __arch_install_post
 
 Name:           wechat
-Version:        4.0.0.21
+Version:        4.0.0.30
 Release:        1%{?dist}
 Summary:        WeChat
 License:        Proprietary
 URL:            https://weixin.qq.com
-Source0:        https://archive2.kylinos.cn/DEB/KYLIN_DEB/pool/main/deb/wechat/wechat-beta_%{version}_amd64.deb
+Source0:        https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.rpm
 Source1:        wechat.desktop
 Source2:        wechat.svg
 Source3:        wechat
 
 AutoReqProv:    no
-BuildRequires:  dpkg
+BuildRequires:  rpm, cpio
 Requires:       libbz2.so.1()(64bit)
 
 %description
@@ -23,7 +23,7 @@ WeChat from Tencent
 
 %prep
 %setup -T -c %{name}-%{version}
-dpkg -X %{S:0} %{_builddir}/%{name}-%{version}
+rpm2cpio %{S:0} | cpio -idmv --no-absolute-filenames -D %{_builddir}/%{name}-%{version}
 
 %build
 
@@ -43,6 +43,9 @@ install -Dm755 %{S:3} -t %{buildroot}%{_bindir}
 /opt/wechat/
 
 %changelog
+* Fri Nov 8 2024 nobody <nobody@nobody.com> - 4.0.0.30
+  - new version
+
 * Mon Nov 4 2024 nobody <nobody@nobody.com> - 4.0.0.21
   - new version