diff --git a/0001-Fix-the-problem-that-the-contents-of-youker-assistan.patch b/0001-Fix-the-problem-that-the-contents-of-youker-assistan.patch new file mode 100644 index 0000000..df9607a --- /dev/null +++ b/0001-Fix-the-problem-that-the-contents-of-youker-assistan.patch @@ -0,0 +1,37 @@ +From 7c750ff3dbcfab2446598bdb0289807125885c6f Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Mon, 30 May 2022 10:40:41 +0800 +Subject: [PATCH] Fix the problem that the contents of youker-assistant are not + displayed + +--- + .../systemdaemon/conf/com.kylin.assistant.systemdaemon.service | 2 +- + kyasDbus/systemdaemon/kacmdtool.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service b/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service +index 7dc6fc8..7d019d1 100644 +--- a/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service ++++ b/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service +@@ -1,4 +1,4 @@ + [D-BUS Service] + Name=com.kylin.assistant.systemdaemon +-Exec=/usr/bin/kylin-assistant-systemdaemon.py ++Exec=/usr/lib/python3/dist-packages/kylin-assistant-daemon/systemdaemon/kasystemdbusmain.py + User=root +diff --git a/kyasDbus/systemdaemon/kacmdtool.py b/kyasDbus/systemdaemon/kacmdtool.py +index 8a699f2..b12f6cb 100644 +--- a/kyasDbus/systemdaemon/kacmdtool.py ++++ b/kyasDbus/systemdaemon/kacmdtool.py +@@ -318,7 +318,7 @@ class KACmdTool(): + if not forceLoad and len(self.lshwSystemList) > 0 : + return + +- args = ["lshw"] ++ args = ["/usr/sbin/lshw"] + pipe = subprocess.Popen(args, env={'LANGUAGE':'en:'}, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + output = pipe.stdout.readlines() + +-- +2.33.0 + diff --git a/youker-assistant.spec b/youker-assistant.spec index dac9d9d..3dcab6c 100644 --- a/youker-assistant.spec +++ b/youker-assistant.spec @@ -1,11 +1,12 @@ %define debug_package %{nil} Name: youker-assistant Version: 3.0.3 -Release: 2 +Release: 3 Summary: youker-assistant License: GPL-2+ and GPL-3 URL: https://github.com/UbuntuKylin/youker-assistant Source0: %{name}-%{version}.tar.gz +Patch01: 0001-Fix-the-problem-that-the-contents-of-youker-assistan.patch BuildRequires: python3-devel python3-lxml python3-dbus python3-pyxdg BuildRequires: qt5-qtcharts qt5-qtcharts-devel @@ -37,6 +38,7 @@ user experience. %prep %setup -q +%patch1 -p1 %build export PATH=%{_qt5_bindir}:$PATH @@ -65,6 +67,9 @@ popd %{_datadir}/polkit-1/actions/com.kylin.assistant.systemdaemon.policy %changelog +* Mon May 30 2022 peijiankang - 3.0.3-3 +- Fix the problem that the contents of youker-assistant are not displayed + * Thu May 26 2022 peijiankang - 3.0.3-2 - remove {%if 0 and %endif}