update new version 3.0.4

This commit is contained in:
peijiankang 2023-05-23 09:36:26 +08:00
parent b0ec7f5990
commit 519ff77a91
5 changed files with 62 additions and 9 deletions

View File

@ -0,0 +1,43 @@
From e32410f8b949a63684c5b0868e5d95f831fce684 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Mon, 5 Dec 2022 16:31:59 +0800
Subject: [PATCH] fix compile error of youker-assistant
---
kylin-assistant.pro | 6 ++++++
src/src.pro | 6 +++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/kylin-assistant.pro b/kylin-assistant.pro
index fc58122..f54d63e 100644
--- a/kylin-assistant.pro
+++ b/kylin-assistant.pro
@@ -15,3 +15,9 @@ TRANSLATIONS += \
CONFIG += qt
QT += widgets
+
+man.files += man/*
+man.path = /usr/share/man/man1/
+
+INSTALLS += man
+
diff --git a/src/src.pro b/src/src.pro
index 03f783c..5cd4b2a 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -74,6 +74,10 @@ desktop.path = /usr/share/applications
target.source += $$TARGET
target.path = /usr/bin
+translation.files += translation/*.qm
+translation.path = /usr/share/youker-assistant/translations
+
INSTALLS += \
target \
- desktop
+ desktop \
+ translation
--
2.33.0

View File

@ -17,7 +17,7 @@ index 911f56b..21061a4 100644
QStringList options; QStringList options;
- options << "-l" << "|" << "grep" << "youker-assistant"; - options << "-l" << "|" << "grep" << "youker-assistant";
- proc.start("dpkg", options); - proc.start("dpkg", options);
+ options << "-qa" << "|" << "grep" << "youker-assistant"; + options << "-q" << "youker-assistant";
+ proc.start("rpm", options); + proc.start("rpm", options);
proc.waitForFinished(); proc.waitForFinished();
QString dpkgInfo = proc.readAll(); QString dpkgInfo = proc.readAll();

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: youker-assistant Name: youker-assistant
Version: 3.0.3 Version: 3.0.4
Release: 7 Release: 3
Summary: youker-assistant Summary: youker-assistant
License: GPL-2+ and GPL-3 License: GPL-2+ and GPL-3
URL: https://github.com/UbuntuKylin/youker-assistant URL: https://github.com/UbuntuKylin/youker-assistant
@ -8,8 +8,8 @@ Source0: %{name}-%{version}.tar.gz
Patch01: 0001-Fix-the-problem-that-the-contents-of-youker-assistan.patch Patch01: 0001-Fix-the-problem-that-the-contents-of-youker-assistan.patch
Patch02: 0002-modify-version-of-youker-assistant-is-null.patch Patch02: 0002-modify-version-of-youker-assistant-is-null.patch
Patch03: 0003-Repairing-data-transfer-failure-of-DBUS-service.patch Patch03: 0003-Repairing-data-transfer-failure-of-DBUS-service.patch
Patch04: 0001-fix-compile-error-of-youker-assistant.patch
BuildRequires: python3-devel python3-lxml python3-dbus python3-pyxdg
BuildRequires: qt5-qtcharts qt5-qtcharts-devel BuildRequires: qt5-qtcharts qt5-qtcharts-devel
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtsvg-devel
@ -24,11 +24,11 @@ BuildRequires: qt5-qtx11extras-devel
BuildRequires: libXrandr-devel BuildRequires: libXrandr-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: ukui-interface BuildRequires: ukui-interface
BuildRequires: SDL2-devel
BuildRequires: libepoxy-devel
Requires: python3-dbus python3-psutil python3-lxml python-psutil python3-pillow python3-i2c-tools python3-pyxdg 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 xorg-x11-utils dmidecode pciutils ukui-interface hwinfo smartmontools net-tools
%description %description
Integrated tool to aid in routine system maintenance tasks Integrated tool to aid in routine system maintenance tasks
Kylin Assistant is a tool designed to help Ubuntu and Ubuntu Kylin Kylin Assistant is a tool designed to help Ubuntu and Ubuntu Kylin
@ -42,13 +42,14 @@ user experience.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
export PATH=%{_qt5_bindir}:$PATH export PATH=%{_qt5_bindir}:$PATH
mkdir qmake-build mkdir qmake-build
pushd qmake-build pushd qmake-build
%{qmake_qt5} .. %{qmake_qt5} ..
%{make_build} %{make_build} -j4
popd popd
%install %install
@ -64,19 +65,28 @@ cp -r %{_builddir}/%{name}-%{version}/data/toolkit %{buildroot}/usr/share/kylin-
%{_sysconfdir}/dbus-1/system.d/com.kylin.assistant.systemdaemon.conf %{_sysconfdir}/dbus-1/system.d/com.kylin.assistant.systemdaemon.conf
%{_bindir}/kylin-assistant %{_bindir}/kylin-assistant
%{_prefix}/lib/python3/dist-packages/kylin-assistant-daemon/systemdaemon/* %{_prefix}/lib/python3/dist-packages/kylin-assistant-daemon/systemdaemon/*
%{_prefix}/lib/python3/dist-packages/kylin-assistant-daemon/sessiondaemon/*
%{_libdir}/kylin-assistant/libdrivemanage.so %{_libdir}/kylin-assistant/libdrivemanage.so
%{_libdir}/kylin-assistant/libhwmonitor.so %{_libdir}/kylin-assistant/libhwmonitor.so
%{_libdir}/kylin-assistant/libhwparam.so %{_libdir}/kylin-assistant/libhwparam.so
%{_libdir}/kylin-assistant/libmachineinfo.so %{_libdir}/kylin-assistant/libmachineinfo.so
%{_datadir}/man/man1/*
%{_datadir}/youker-assistant/translations/*.qm %{_datadir}/youker-assistant/translations/*.qm
%{_datadir}/applications/kylin-assistant.desktop %{_datadir}/applications/kylin-assistant.desktop
%{_datadir}/dbus-1/system-services/com.kylin.assistant.systemdaemon.service %{_datadir}/dbus-1/system-services/com.kylin.assistant.systemdaemon.service
%{_datadir}/dbus-1/services/com.kylin.assistant.sessiondaemon.service
%{_datadir}/polkit-1/actions/com.kylin.assistant.systemdaemon.policy %{_datadir}/polkit-1/actions/com.kylin.assistant.systemdaemon.policy
%{_datadir}/kylin-user-guide/data/guide %{_datadir}/kylin-user-guide/data/guide
%changelog %changelog
* Fri Dec 09 2022 wangyueliang <wangyueliang@kylinos.cn> - 3.0.3-7 * Wed Mar 22 2023 peijiankang <peijiankang@kylinos.cn> - 3.0.4-3
- Fix unsafe compile option not stripped - fix version of youker-assistant is debugsource
* Fri Dec 09 2022 wangyueliang <wangyueliang@kylinos.cn> - 3.0.4-2
- Fix unsafe compile option STRIP
* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.4-1
- update version to 3.0.4
* Fri Aug 26 2022 huayadong <huayadong@kylinos.cn> - 3.0.3-6 * Fri Aug 26 2022 huayadong <huayadong@kylinos.cn> - 3.0.3-6
- Repairing data transfer failure of DBUS service - Repairing data transfer failure of DBUS service