From 6de54c88980c0b8c2bad4f12893cd327d51c5784 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Mon, 9 Jan 2023 16:18:14 +0800
Subject: [PATCH] fix translation problem of ukui-panel

---
 ...ix-translation-problem-of-ukui-panel.patch |  38 ++++++++++++++++++
 ukui-panel.spec                               |  12 +++---
 ukui-panel_zh_CN.qm                           | Bin 5336 -> 0 bytes
 3 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 0001-fix-translation-problem-of-ukui-panel.patch
 delete mode 100644 ukui-panel_zh_CN.qm

diff --git a/0001-fix-translation-problem-of-ukui-panel.patch b/0001-fix-translation-problem-of-ukui-panel.patch
new file mode 100644
index 0000000..8177e4f
--- /dev/null
+++ b/0001-fix-translation-problem-of-ukui-panel.patch
@@ -0,0 +1,38 @@
+From c597f6c0b035ff6d0f6e4b1b129691ecc01d0896 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Mon, 9 Jan 2023 16:12:14 +0800
+Subject: [PATCH] fix translation problem of ukui-panel
+
+---
+ cmake/UkuiPluginTranslationTs.cmake | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/UkuiPluginTranslationTs.cmake b/cmake/UkuiPluginTranslationTs.cmake
+index 6409d30..3faa70e 100644
+--- a/cmake/UkuiPluginTranslationTs.cmake
++++ b/cmake/UkuiPluginTranslationTs.cmake
+@@ -12,17 +12,17 @@ endif()
+ if(EXISTS ${TS_FILES})
+     message(STATUS "${TS_FILES} is EXISTS")
+     execute_process(
+-        COMMAND lupdate -recursive ${CMAKE_CURRENT_SOURCE_DIR} -target-language zh_CN -ts ${TS_FILES}
++        COMMAND lupdate-qt5 -recursive ${CMAKE_CURRENT_SOURCE_DIR} -target-language zh_CN -ts ${TS_FILES}
+         )
+     execute_process(
+-        COMMAND lrelease ${TS_FILES}
++        COMMAND lrelease-qt5 ${TS_FILES}
+         )
+ else()
+     execute_process(
+-        COMMAND lupdate -recursive ${CMAKE_CURRENT_SOURCE_DIR} -target-language zh_CN -ts ${TS_FILES}
++        COMMAND lupdate-qt5 -recursive ${CMAKE_CURRENT_SOURCE_DIR} -target-language zh_CN -ts ${TS_FILES}
+         )
+     execute_process(
+-        COMMAND lrelease ${TS_FILES}
++        COMMAND lrelease-qt5 ${TS_FILES}
+         )
+ endif()
+ 
+-- 
+2.33.0
+
diff --git a/ukui-panel.spec b/ukui-panel.spec
index 044be8f..91bf62f 100644
--- a/ukui-panel.spec
+++ b/ukui-panel.spec
@@ -2,12 +2,12 @@
 
 Name:           ukui-panel
 Version:        3.1.0
-Release:        3
+Release:        4
 Summary:        ukui desktop panel
 License:        LGPL-2.0-or-later  and GPL-2.0-or-later and BSD
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
-Source1:        ukui-panel_zh_CN.qm
+Patch01:        0001-fix-translation-problem-of-ukui-panel.patch
 
 BuildRequires: cmake
 BuildRequires: alsa-lib-devel
@@ -40,7 +40,6 @@ BuildRequires: libpeony-dev
 BuildRequires: dconf-devel
 BuildRequires: libpeony-dev
 BuildRequires: libXtst-devel
-BuildRequires: libX11-devel
 BuildRequires: libudisks2-devel
 BuildRequires: xcb-util-renderutil-devel
 BuildRequires: xcb-util-image-devel
@@ -59,8 +58,8 @@ Recommends: time-shutdown
 
 %prep
 %setup -q
+%patch01 -p1
 
-cp -rf %{SOURCE1} %{_builddir}/%{name}-%{version}/panel/resources
 %build
 mkdir build && cd build
 %{cmake3} ..
@@ -82,7 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/*
 
 %changelog
-* Thu Dec 08 2022 huayadong <huayadong@kylinos.cn> - 3.0.1-3
+* Mon Jan 9 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-4
+- fix translation problem of ukui-panel
+
+* Thu Dec 08 2022 huayadong <huayadong@kylinos.cn> - 3.1.0-3
 - delete  Recommends: libkysdk-system
 
 * Thu Dec 8 2022 douyan <douyan@kylinos.cn> - 3.1.0-2
diff --git a/ukui-panel_zh_CN.qm b/ukui-panel_zh_CN.qm
deleted file mode 100644
index 7dea86252c1c9782a3368635356df9866cf457b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5336
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
LbQ<vPY2<$aM__+Y