From 579630a1f42e35dccb2a3ab62a0fc69a567bf776 Mon Sep 17 00:00:00 2001
From: dou33 <douyan@kylinos.cn>
Date: Wed, 2 Mar 2022 16:36:08 +0800
Subject: [PATCH] fix power missing issue

---
 0003-fix-power-missing-issue.patch | 29 +++++++++++++++++++++++++++++
 ukui-control-center.spec           |  8 +++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 0003-fix-power-missing-issue.patch

diff --git a/0003-fix-power-missing-issue.patch b/0003-fix-power-missing-issue.patch
new file mode 100644
index 0000000..4b75fce
--- /dev/null
+++ b/0003-fix-power-missing-issue.patch
@@ -0,0 +1,29 @@
+diff -Naur ukui-control-center-3.0.4/shell/mainwindow.cpp ukui-control-center-3.0.4-/shell/mainwindow.cpp
+--- ukui-control-center-3.0.4/shell/mainwindow.cpp	2021-11-19 10:02:39.000000000 +0800
++++ ukui-control-center-3.0.4-/shell/mainwindow.cpp	2022-03-02 15:52:56.715867011 +0800
+@@ -794,7 +794,7 @@
+ bool MainWindow::isExitsCloudAccount() {
+     QProcess *wifiPro = new QProcess();
+     QString shellOutput = "";
+-    wifiPro->start("dpkg -l  | grep kylin-sso-client");
++    wifiPro->start("rpm -qa|grep kylin-sso-client");
+     wifiPro->waitForFinished();
+     QString output = wifiPro->readAll();
+     shellOutput += output;
+@@ -811,14 +811,14 @@
+ bool MainWindow::isExitsPower()
+ {
+     QProcess *process = new QProcess;
+-    process->start("dpkg -l ukui-power-manager");
++    process->start("rpm -q ukui-power-manager");
+     process->waitForFinished();
+ 
+     QByteArray ba = process->readAllStandardOutput();
+     delete process;
+     QString mOutput = QString(ba.data());
+ 
+-    return mOutput.contains("ii", Qt::CaseSensitive) ? true : false;
++    return mOutput.contains("ukui-power-manager", Qt::CaseSensitive) ? true : false;
+ }
+ 
+ bool MainWindow::dblOnEdge(QMouseEvent *event) {
diff --git a/ukui-control-center.spec b/ukui-control-center.spec
index a508b16..2c5b207 100644
--- a/ukui-control-center.spec
+++ b/ukui-control-center.spec
@@ -1,13 +1,14 @@
 %define debug_package %{nil}
 Name:           ukui-control-center
 Version:        3.0.4
-Release:        3
+Release:        4
 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
 Patch02:        0002-modify-area-info-display-error.patch
+Patch03:        0003-fix-power-missing-issue.patch
 
 BuildRequires: qt5-qtsvg-devel
 BuildRequires: qt5-qtbase-devel
@@ -106,6 +107,8 @@ Suggests: ukui-settings-daemon
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
 %build
 qmake-qt5
 make -j24
@@ -153,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 2 2022 douyan <douyan@kylinos.cn> - 3.0.4-4
+- fix power missing issue
+
 * Tue Mar 1 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.4-3
 - modify area-info display error