diff --git a/0001-fix-compile-error-of-ukui-control-center.patch b/0001-fix-compile-error-of-ukui-control-center.patch index 7859d8d..ef63c46 100644 --- a/0001-fix-compile-error-of-ukui-control-center.patch +++ b/0001-fix-compile-error-of-ukui-control-center.patch @@ -1,24 +1,39 @@ -From 3cc51117c8b83ae24abf530a88b61c43cf6e59bd Mon Sep 17 00:00:00 2001 +From 5e47f424d62f41d983ed1f9bcf26786ee0a74834 Mon Sep 17 00:00:00 2001 From: peijiankang -Date: Tue, 1 Nov 2022 12:41:24 +0800 +Date: Wed, 1 Mar 2023 16:33:16 +0800 Subject: [PATCH] fix compile error of ukui-control-center --- - translate_generation.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + changeUserPwd/run-passwd.cpp | 2 +- + translate_generation.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +diff --git a/changeUserPwd/run-passwd.cpp b/changeUserPwd/run-passwd.cpp +index c48297d..3b416ec 100644 +--- a/changeUserPwd/run-passwd.cpp ++++ b/changeUserPwd/run-passwd.cpp +@@ -362,7 +362,7 @@ static gboolean io_watch_stdout (GIOChannel *source, GIOCondition condition, Pas + "Your password has been changed after you verify!"); + } */else { + error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_UNKNOWN, +- str->str); ++ "Unknown error"); + } + + /* At this point, passwd might have exited, in which case diff --git a/translate_generation.sh b/translate_generation.sh -index 7bf4000..cb0c65c 100755 +index 7bf4000..c971497 100755 --- a/translate_generation.sh +++ b/translate_generation.sh -@@ -10,6 +10,6 @@ do - if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then +@@ -7,7 +7,7 @@ version=(`echo $ID`) + for ts in "${ts_list[@]}" + do + printf "\nprocess ${ts}\n" +- if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then ++ if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ] || [ "$version" == "openEuler" ];then lrelease-qt5 "${ts}" else -- lrelease "${ts}" -+ lrelease-qt5 "${ts}" - fi - done + lrelease "${ts}" -- -2.36.1 +2.33.0 diff --git a/0011-Fix-about-copyright-display-error.patch b/0011-Fix-about-copyright-display-error.patch new file mode 100644 index 0000000..9810329 --- /dev/null +++ b/0011-Fix-about-copyright-display-error.patch @@ -0,0 +1,25 @@ +From 648547177ddceb27394135bb276deb18666019cf Mon Sep 17 00:00:00 2001 +From: tanyulong2021 +Date: Mon, 27 Feb 2023 14:37:21 +0800 +Subject: [PATCH] Fix about copyright display error + +--- + plugins/system/about/about.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/system/about/about.cpp b/plugins/system/about/about.cpp +index e63591c..824b781 100644 +--- a/plugins/system/about/about.cpp ++++ b/plugins/system/about/about.cpp +@@ -465,7 +465,7 @@ void About::initUI(QWidget *widget) + mActivationLayout_1->addLayout(mActivationLayout); + mActivationLayout_1->addWidget(mActivationBtn); + +- QString currentyear("2022"); ++ QString currentyear("2023"); + mTipLabel = new FixLabel(QString(tr("Copyright © 2009-%1 KylinSoft. All rights reserved.")).arg(currentyear) , Aboutwidget); + mTipLabel->setContentsMargins(16 , 0 , 0 , 0); + +-- +2.33.0 + diff --git a/0011-fix-add-group-failed-issue.patch b/0012-fix-add-group-failed-issue.patch similarity index 100% rename from 0011-fix-add-group-failed-issue.patch rename to 0012-fix-add-group-failed-issue.patch diff --git a/ukui-control-center.spec b/ukui-control-center.spec index 43ffc80..f56eec9 100644 --- a/ukui-control-center.spec +++ b/ukui-control-center.spec @@ -1,7 +1,6 @@ -%define debug_package %{nil} Name: ukui-control-center Version: 3.1.2 -Release: 10 +Release: 12 Summary: utilities to configure the UKUI desktop License: GPL-2+ URL: http://www.ukui.org @@ -13,7 +12,8 @@ Patch05: 0005-Fix-the-problem-of-displaying-none-in-the-interface-version Patch07: 0007-modify-icon-theme-not-display.patch Patch08: ukui-control-center-3.0.4-fix-invalid-automatic-login.patch Patch10: 0010-Fix-the-problem-of-scrambled-shortcut-keys.patch -Patch11: 0011-fix-add-group-failed-issue.patch +Patch11: 0011-Fix-about-copyright-display-error.patch +Patch12: 0012-fix-add-group-failed-issue.patch BuildRequires: qt5-qtsvg-devel BuildRequires: gsettings-qt-devel @@ -83,12 +83,12 @@ The UKUI control center contains configuration applets for the UKUI des allowing %autosetup -n %{name}-%{version} -p1 %build -qmake-qt5 -make -j4 +%{qmake_qt5} +%{make_build} %install rm -rf $RPM_BUILD_ROOT -make INSTALL_ROOT=%{buildroot} install +%{make_install} INSTALL_ROOT=%{buildroot} mkdir -p %{buildroot}/etc/xdg/autostart/ @@ -139,9 +139,15 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Mar 01 2023 tanyulong - 3.1.2-10 +* Wed Mar 01 2023 peijiankang - 3.1.2-12 +- add build debuginfo and debugsource + +* Wed Mar 01 2023 tanyulong - 3.1.2-11 - fix add group failed issue +* Mon Feb 27 2023 tanyulong - 3.1.2-10 +- Fix about copyright display error + * Tue Feb 7 2023 douyan - 3.1.2-9 - change power default setting