From 20c4639e9bb3254ccfc378d5b2f4921c41f7c547 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Wed, 14 Jun 2023 09:51:17 +0800
Subject: [PATCH] update kylin-calculator.desktop

(cherry picked from commit f6a27a604cf4284f662f73735156e29d547f2e1a)
---
 0001-update-kylin-calculator.desktop.patch | 56 ++++++++++++++++++++++
 kylin-calculator.spec                      | 14 ++++--
 2 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 0001-update-kylin-calculator.desktop.patch

diff --git a/0001-update-kylin-calculator.desktop.patch b/0001-update-kylin-calculator.desktop.patch
new file mode 100644
index 0000000..7d4d4a5
--- /dev/null
+++ b/0001-update-kylin-calculator.desktop.patch
@@ -0,0 +1,56 @@
+From 69e05fa36f398d7302b3524af2ee2c27ab6b206c Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Wed, 14 Jun 2023 09:31:23 +0800
+Subject: [PATCH] update kylin-calculator.desktop
+
+---
+ kylin-calculator.desktop                 | 3 +++
+ kylin-calculator.pri                     | 2 +-
+ translations/generate_translations_qm.sh | 4 ++--
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/kylin-calculator.desktop b/kylin-calculator.desktop
+index 47c91bf..f8b3f5a 100644
+--- a/kylin-calculator.desktop
++++ b/kylin-calculator.desktop
+@@ -2,8 +2,11 @@
+ Name=Calculator
+ Name[zh_CN]=计算器
+ Name[bo_CN]=རྩིས་ཆས།
++Name[zh_HK]=計算器
+ GenericName[bo_CN]=རྩིས་ཆས།
+ GenericName=Calculator
++GenericName[zh_CN]=计算器
++GenericName[zh_HK]=計算器
+ Keywords=calculator
+ Exec=/usr/bin/kylin-calculator %u
+ Icon=kylin-calculator
+diff --git a/kylin-calculator.pri b/kylin-calculator.pri
+index 5bfef56..c330e31 100644
+--- a/kylin-calculator.pri
++++ b/kylin-calculator.pri
+@@ -15,7 +15,7 @@ LIBS += -L/usr/lib/libukui-log4qt.so.1.0.0 -lukui-log4qt
+ CONFIG += link_pkgconfig c++11 link_pkgconfig lrelease
+ PKGCONFIG += gsettings-qt gsl
+ 
+-message($$system(./translations/sgenerate_translations_qm.sh))
++message($$system(./translations/generate_translations_qm.sh))
+ 
+ INCLUDEPATH +=                \
+     $$PWD/src/                \
+diff --git a/translations/generate_translations_qm.sh b/translations/generate_translations_qm.sh
+index 62fa6b5..c162798 100755
+--- a/translations/generate_translations_qm.sh
++++ b/translations/generate_translations_qm.sh
+@@ -4,5 +4,5 @@ ts_file_list=(`ls translations/*.ts`)
+ 
+ for ts in "${ts_file_list[@]}"
+ do
+-    lrelease "${ts}"
+-done
+\ No newline at end of file
++    lrelease-qt5 "${ts}"
++done
+-- 
+2.33.0
+
diff --git a/kylin-calculator.spec b/kylin-calculator.spec
index 514a3b6..14f857c 100644
--- a/kylin-calculator.spec
+++ b/kylin-calculator.spec
@@ -1,11 +1,11 @@
 Name:           kylin-calculator
 Version:        1.1.0
-Release:        2
+Release:        3
 Summary:        Calculator tool for UKUI
 License:        LGPL-3.0-or-later and GPL-3.0-or-later
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
-
+Patch01:        0001-update-kylin-calculator.desktop.patch
 
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qtchooser
@@ -31,6 +31,7 @@ and other advantages.
 
 %prep
 %setup -q
+%patch01 -p1
 
 %build
 %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default  kylin-calculator.pro
@@ -40,8 +41,6 @@ and other advantages.
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=%{buildroot} install
 
-mkdir -p %{buildroot}/etc/bin/
-cp %{buildroot}/usr/bin/kylin-calculator %{buildroot}/etc/bin
 mkdir -p %{buildroot}/usr/share/doc/kylin-calculator/
 mkdir -p %{buildroot}/usr/share/man/man1/
 mkdir -p %{buildroot}/usr/share/pixmaps/
@@ -55,7 +54,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %{_bindir}/kylin-calculator
-%{_sysconfdir}/bin/kylin-calculator
 %{_datadir}/applications/kylin-calculator.desktop
 %{_datadir}/doc/kylin-calculator/changelog.gz
 %{_datadir}/doc/kylin-calculator/copyright
@@ -68,6 +66,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kylin-user-guide/data/guide/kylin-calculator/*
 
 %changelog
+* Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.0-3
+- Type:bugfix
+- CVE:
+- SUG:NA
+- DESC: update kylin-calculator.desktop
+
 * Mon Jan 30 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.0-2
 - add debugsource and debuginfo
 
-- 
Gitee