diff --git a/0001-install-schema-files-to-fix-build-error.patch b/0001-install-schema-files-to-fix-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..cdfbd0fa3c5febb46e95ff0f4e792ac6e19e22a9 --- /dev/null +++ b/0001-install-schema-files-to-fix-build-error.patch @@ -0,0 +1,38 @@ +From d5bf83a93dba9b2cf8c14236697b65b084424326 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= +Date: Sun, 7 Apr 2024 17:17:46 +0800 +Subject: [PATCH] install schema files to fix build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: 侯红勋 +--- + kylin-calculator.pri | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/kylin-calculator.pri b/kylin-calculator.pri +index ac08009..86d9857 100644 +--- a/kylin-calculator.pri ++++ b/kylin-calculator.pri +@@ -108,6 +108,9 @@ guide.path = /usr/share/kylin-user-guide/data/guide/ + lib.files = $$PWD/libkylin-calculator.so + lib.path = /opt/small-plugin/children/bin + ++schemes.files += $$PWD/data/org.kylin-calculator-data.gschema.xml $$PWD/data/org.ukui.log4qt.kylin-calculator.gschema.xml ++schemes.path = /usr/share/glib-2.0/schemas/ ++ + desktop.files += $$PWD/kylin-calculator.desktop + desktop.path = /usr/share/applications/ + +@@ -117,6 +120,7 @@ translationsFiles.path = /usr/share/kylin-calculator/translations/ + INSTALLS += \ + target \ + lib \ ++ schemes \ + desktop \ + translationsFiles \ + guide \ +-- +2.33.0 + diff --git a/0001-update-kylin-calculator.desktop.patch b/0001-update-kylin-calculator.desktop.patch deleted file mode 100644 index 7d4d4a596d555f2cb079345699b9e6d790730a4e..0000000000000000000000000000000000000000 --- a/0001-update-kylin-calculator.desktop.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 69e05fa36f398d7302b3524af2ee2c27ab6b206c Mon Sep 17 00:00:00 2001 -From: peijiankang -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-1.1.0.tar.gz b/kylin-calculator-1.1.0.tar.gz deleted file mode 100644 index 63182d3594c4059bbb356ada2cefbb21ba6c2748..0000000000000000000000000000000000000000 Binary files a/kylin-calculator-1.1.0.tar.gz and /dev/null differ diff --git a/kylin-calculator-1.2.0.0.tar.gz b/kylin-calculator-1.2.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0cc847620d7fee97dadb8c9d8b90a889a2e835f6 Binary files /dev/null and b/kylin-calculator-1.2.0.0.tar.gz differ diff --git a/kylin-calculator.spec b/kylin-calculator.spec index 14f857c3c817b4592551c98a21260147686a4b72..47d255661580c31c28050863d913dc628b9b4eed 100644 --- a/kylin-calculator.spec +++ b/kylin-calculator.spec @@ -1,11 +1,11 @@ Name: kylin-calculator -Version: 1.1.0 -Release: 3 +Version: 1.2.0.0 +Release: 1 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 +Patch01: 0001-install-schema-files-to-fix-build-error.patch BuildRequires: qt5-qtbase-devel BuildRequires: qtchooser @@ -18,7 +18,14 @@ BuildRequires: qt5-qtx11extras-devel BuildRequires: gsettings-qt-devel BuildRequires: ukui-interface BuildRequires: gmp-devel +BuildRequires: opencv BuildRequires: libkysdk-kabase-devel +BuildRequires: libkysdk-sysinfo-devel +BuildRequires: libkysdk-alm-devel +BuildRequires: libkysdk-ukenv-devel +BuildRequires: libkysdk-diagnostics-devel +BuildRequires: libkysdk-waylandhelper-devel +BuildRequires: libkysdk-qtwidgets-devel # Requires: NetworkManager @@ -62,10 +69,20 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/glib-2.0/schemas/org.kylin-calculator-data.gschema.xml %{_datadir}/glib-2.0/schemas/org.ukui.log4qt.kylin-calculator.gschema.xml %{_datadir}/kylin-calculator/translations/kylin-calculator_zh_CN.qm +%{_datadir}/kylin-calculator/translations/kylin-calculator_zh_HK.qm %{_datadir}/kylin-calculator/translations/kylin-calculator_bo_CN.qm +%{_datadir}/kylin-calculator/translations/kylin-calculator_kk.qm +%{_datadir}/kylin-calculator/translations/kylin-calculator_ky.qm +%{_datadir}/kylin-calculator/translations/kylin-calculator_ug.qm %{_datadir}/kylin-user-guide/data/guide/kylin-calculator/* %changelog +* Sun Apr 07 2024 houhongxun - 1.2.0.0-1 +- Type:update +- CVE: +- SUG:NA +- DESC: upgrade to upstream version 1.2.0.0-ok4.1 + * Wed Jun 14 2023 peijiankang - 1.1.0-3 - Type:bugfix - CVE: