From e49f03a57cd43e8f8995e9e76f6459c5bf450be2 Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Tue, 1 Mar 2022 14:39:06 +0800 Subject: [PATCH] modify version-info error --- 0001-modify-version-info-error.patch | 30 ++++++++++++++++++++++++++++ ukui-control-center.spec | 9 ++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 0001-modify-version-info-error.patch diff --git a/0001-modify-version-info-error.patch b/0001-modify-version-info-error.patch new file mode 100644 index 0000000..c43b861 --- /dev/null +++ b/0001-modify-version-info-error.patch @@ -0,0 +1,30 @@ +From 56af3614f31d303d2664850b8ca9c541cdf0258c Mon Sep 17 00:00:00 2001 +From: pei-jiankang +Date: Tue, 1 Mar 2022 14:33:45 +0800 +Subject: [PATCH] modify version-info error + +--- + plugins/messages-task/about/about.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/plugins/messages-task/about/about.cpp b/plugins/messages-task/about/about.cpp +index e675232..e29c227 100644 +--- a/plugins/messages-task/about/about.cpp ++++ b/plugins/messages-task/about/about.cpp +@@ -197,6 +197,13 @@ void About::setupVersionCompenent() + version = rx.cap(1); + } + } ++ else if(str.contains("VERSION=")) { ++ QRegExp rx("VERSION=\"(.*)\"$"); ++ int pos = rx.indexIn(str); ++ if (pos > -1) { ++ version = rx.cap(1); ++ } ++ } + } + } + +-- +2.33.0 + diff --git a/ukui-control-center.spec b/ukui-control-center.spec index 9b3e2f1..80d9e99 100644 --- a/ukui-control-center.spec +++ b/ukui-control-center.spec @@ -1,12 +1,12 @@ %define debug_package %{nil} Name: ukui-control-center Version: 3.0.4 -Release: 1 +Release: 2 Summary: utilities to configure the UKUI desktop License: GPL-2+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz - +Patch01: 0001-modify-version-info-error.patch BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtbase-devel BuildRequires: gsettings-qt-devel @@ -102,7 +102,7 @@ Suggests: ukui-settings-daemon %prep %setup -q - +%patch1 -p1 %build qmake-qt5 make -j24 @@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 1 2022 pei-jiankang - 3.0.4-2 +- modify version-info error + * Wed Jan 26 2022 huayadong - 3.0.4-1 - update to upstream version 3.0.4-1