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 deleted file mode 100644 index df9607a690006acb3eac9f34fa119b5cf514f7d6..0000000000000000000000000000000000000000 --- a/0001-Fix-the-problem-that-the-contents-of-youker-assistan.patch +++ /dev/null @@ -1,37 +0,0 @@ -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/0002-modify-version-of-youker-assistant-is-null.patch b/0001-fix-blank-of-youker-assistant-3.0.2.0.patch similarity index 52% rename from 0002-modify-version-of-youker-assistant-is-null.patch rename to 0001-fix-blank-of-youker-assistant-3.0.2.0.patch index 731b59ce2f444acda302aef0183bb56c9b394628..46550734de34757b3210f4f1b13fce315e68910e 100644 --- a/0002-modify-version-of-youker-assistant-is-null.patch +++ b/0001-fix-blank-of-youker-assistant-3.0.2.0.patch @@ -1,14 +1,15 @@ -From a755f802c3b65ac7b88c129ca64b112a7225b8b7 Mon Sep 17 00:00:00 2001 +From 0d79a50576d59044b24be3f2c4d274305ed5822f Mon Sep 17 00:00:00 2001 From: peijiankang -Date: Mon, 30 May 2022 10:57:43 +0800 -Subject: [PATCH] modify version of youker-assistant is null +Date: Wed, 26 Feb 2025 11:35:00 +0800 +Subject: [PATCH] fix blank of youker-assistant 3.0.2.0 --- - commonfunc/utils.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + commonfunc/utils.cpp | 6 +++--- + .../conf/com.kylin.assistant.systemdaemon.service | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commonfunc/utils.cpp b/commonfunc/utils.cpp -index 911f56b..21061a4 100644 +index 911f56b..50889b1 100644 --- a/commonfunc/utils.cpp +++ b/commonfunc/utils.cpp @@ -64,15 +64,15 @@ QString getKAVersion() @@ -30,6 +31,16 @@ index 911f56b..21061a4 100644 if (lineInfoList.size() >= 3) { versionText = lineInfoList[2]; } +diff --git a/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service b/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service +index 7dc6fc8..5e9bf73 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/bin/python3 /usr/bin/kylin-assistant-systemdaemon.py + User=root -- -2.33.0 +2.48.1 diff --git a/0003-Repairing-data-transfer-failure-of-DBUS-service.patch b/0003-Repairing-data-transfer-failure-of-DBUS-service.patch deleted file mode 100644 index 7694fb21ef8a5abbcf13674658e893a890a66d17..0000000000000000000000000000000000000000 --- a/0003-Repairing-data-transfer-failure-of-DBUS-service.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0bf08c8c43194de1f4704e221a1450c46f5ec2b6 Mon Sep 17 00:00:00 2001 -From: huayadong -Date: Fri, 26 Aug 2022 11:35:10 +0800 -Subject: [PATCH] Repairing data transfer failure of DBUS service - ---- - .../systemdaemon/conf/com.kylin.assistant.systemdaemon.service | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service b/kyasDbus/systemdaemon/conf/com.kylin.assistant.systemdaemon.service -index 7d019d1..75349e0 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/lib/python3/dist-packages/kylin-assistant-daemon/systemdaemon/kasystemdbusmain.py -+Exec=/usr/bin/python3 /usr/lib/python3/dist-packages/kylin-assistant-daemon/systemdaemon/kasystemdbusmain.py - User=root --- -2.36.1 - diff --git a/youker-assistant.spec b/youker-assistant.spec index 8d91cec91c403e777e98bbad5c98fb94e3131944..5435acca33da6f4bf67fa73ab4be514b5a8ee474 100644 --- a/youker-assistant.spec +++ b/youker-assistant.spec @@ -1,14 +1,12 @@ Name: youker-assistant Version: 3.0.2.0 -Release: 1 +Release: 2 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 -#Patch02: 0002-modify-version-of-youker-assistant-is-null.patch -#Patch03: 0003-Repairing-data-transfer-failure-of-DBUS-service.patch -Patch04: 0001-fix-compile-error-of-youker-assistant.patch +Patch01: 0001-fix-compile-error-of-youker-assistant.patch +Patch02: 0001-fix-blank-of-youker-assistant-3.0.2.0.patch BuildRequires: qt5-qtcharts qt5-qtcharts-devel BuildRequires: qt5-qtbase-devel @@ -32,7 +30,7 @@ BuildRequires: libkysdk-utils-devel Requires: python3-dbus python3-psutil python3-lxml python-psutil python3-pillow python3-i2c-tools python3-pyxdg -Requires: util-linux hdparm lm_sensors lshw xorg-x11-utils dmidecode pciutils ukui-interface hwinfo smartmontools net-tools +Requires: util-linux hdparm lm_sensors lshw dmidecode pciutils ukui-interface hwinfo smartmontools net-tools bluez %description Integrated tool to aid in routine system maintenance tasks @@ -43,11 +41,7 @@ user experience. %prep -%setup -q -#%patch1 -p1 -#%patch2 -p1 -#%patch3 -p1 -%patch4 -p1 +%autosetup -p1 %build export PATH=%{_qt5_bindir}:$PATH @@ -66,6 +60,14 @@ mkdir -p %{buildroot}/usr/share/kylin-user-guide/data/guide cp -r %{_builddir}/%{name}-%{version}/data/kylin-assistant %{buildroot}/usr/share/kylin-user-guide/data/guide +%posttrans +ln -s /usr/lib/python3/dist-packages/kylin-assistant-daemon/systemdaemon/kasystemdbusmain.py /usr/bin/kylin-assistant-systemdaemon.py +ln -s /usr/lib/python3/dist-packages/kylin-assistant-daemon/sessiondaemon/kasessiondbusmain.py /usr/bin/kylin-assistant-sessiondaemon.py + +%postun +unlink /usr/bin/kylin-assistant-systemdaemon.py +unlink /usr/bin/kylin-assistant-sessiondaemon.py + %files %{_sysconfdir}/dbus-1/system.d/com.kylin.assistant.systemdaemon.conf %{_bindir}/kylin-assistant @@ -84,6 +86,9 @@ cp -r %{_builddir}/%{name}-%{version}/data/kylin-assistant %{buildroot}/usr/shar %{_datadir}/kylin-user-guide/data/guide %changelog +* Wed Feb 26 2025 peijiankang - 3.0.2.0-2 +- fix blank of youker-assistant 3.0.2.0 + * Mon Apr 08 2024 peijiankang - 3.0.2.0-1 - update version to 3.0.2.0 from openkylin