!26 [sync] PR-24: update kylin-calculator.desktop
From: @openeuler-sync-bot Reviewed-by: @dou33 Signed-off-by: @dou33
This commit is contained in:
commit
247d93fcde
56
0001-update-kylin-calculator.desktop.patch
Normal file
56
0001-update-kylin-calculator.desktop.patch
Normal file
@ -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
|
||||||
|
|
||||||
@ -1,11 +1,11 @@
|
|||||||
Name: kylin-calculator
|
Name: kylin-calculator
|
||||||
Version: 1.1.0
|
Version: 1.1.0
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Calculator tool for UKUI
|
Summary: Calculator tool for UKUI
|
||||||
License: LGPL-3.0-or-later and GPL-3.0-or-later
|
License: LGPL-3.0-or-later and GPL-3.0-or-later
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
Patch01: 0001-update-kylin-calculator.desktop.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
BuildRequires: qtchooser
|
BuildRequires: qtchooser
|
||||||
@ -31,6 +31,7 @@ and other advantages.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch01 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-calculator.pro
|
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-calculator.pro
|
||||||
@ -40,8 +41,6 @@ and other advantages.
|
|||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make INSTALL_ROOT=%{buildroot} install
|
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/doc/kylin-calculator/
|
||||||
mkdir -p %{buildroot}/usr/share/man/man1/
|
mkdir -p %{buildroot}/usr/share/man/man1/
|
||||||
mkdir -p %{buildroot}/usr/share/pixmaps/
|
mkdir -p %{buildroot}/usr/share/pixmaps/
|
||||||
@ -55,7 +54,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%{_bindir}/kylin-calculator
|
%{_bindir}/kylin-calculator
|
||||||
%{_sysconfdir}/bin/kylin-calculator
|
|
||||||
%{_datadir}/applications/kylin-calculator.desktop
|
%{_datadir}/applications/kylin-calculator.desktop
|
||||||
%{_datadir}/doc/kylin-calculator/changelog.gz
|
%{_datadir}/doc/kylin-calculator/changelog.gz
|
||||||
%{_datadir}/doc/kylin-calculator/copyright
|
%{_datadir}/doc/kylin-calculator/copyright
|
||||||
@ -68,6 +66,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/kylin-user-guide/data/guide/kylin-calculator/*
|
%{_datadir}/kylin-user-guide/data/guide/kylin-calculator/*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon Jan 30 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.0-2
|
||||||
- add debugsource and debuginfo
|
- add debugsource and debuginfo
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user