From 2ccb1d2e9e40468e4113b6ead184917c7cd5e645 Mon Sep 17 00:00:00 2001 From: peijiankang Date: Fri, 9 Dec 2022 15:22:31 +0800 Subject: [PATCH] modify version-info error --- 0001-modify-version-info-error.patch | 32 ++++++++++++++++++++++++++++ ukui-control-center.spec | 9 +++++--- 2 files changed, 38 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..57ce608 --- /dev/null +++ b/0001-modify-version-info-error.patch @@ -0,0 +1,32 @@ +From fc98b89e8acc49ab32abe288e794dbb77659f778 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Fri, 9 Dec 2022 15:20:28 +0800 +Subject: [PATCH] modify version-info error + +--- + plugins/system/about/about.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/plugins/system/about/about.cpp b/plugins/system/about/about.cpp +index 688395e..e63591c 100644 +--- a/plugins/system/about/about.cpp ++++ b/plugins/system/about/about.cpp +@@ -795,7 +795,14 @@ 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); ++ } ++ } ++ } + } + + if (!version.isEmpty()) { +-- +2.33.0 + diff --git a/ukui-control-center.spec b/ukui-control-center.spec index cee95c1..8d8fe30 100644 --- a/ukui-control-center.spec +++ b/ukui-control-center.spec @@ -1,12 +1,13 @@ %define debug_package %{nil} Name: ukui-control-center Version: 3.1.2 -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-fix-compile-error-of-ukui-control-center.patch +Patch02: 0001-modify-version-info-error.patch BuildRequires: qt5-qtsvg-devel BuildRequires: gsettings-qt-devel @@ -71,8 +72,7 @@ Summary: libukcc The UKUI control center contains configuration applets for the UKUI des allowing to set accessibility configuration, desktop fonts, keyboard and mouse properties, sound setup, desktop theme and background, user interface properties, screen resolution, and other UKUI parameters. %prep -%setup -q -%patch01 -p1 +%autosetup -n %{name}-%{version} -p1 %build qmake-qt5 @@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 9 2022 peijiankang - 3.1.2-2 +- modify version-info error + * Mon Dec 5 2022 peijiankang - 3.1.2-1 - update version to 3.1.2