0001-fix-compile-error-of-ukui-system-monitor.patch

@@ -1,31 +0,0 @@
-From a8af8a9301234d548992496014257840d1bcb19c Mon Sep 17 00:00:00 2001
-From: peijiankang <peijiankang@kylinos.cn>
-Date: Mon, 5 Dec 2022 17:19:20 +0800
-Subject: [PATCH] fix compile error of ukui-system-monitor
-
----
- ukui-system-monitor.pro | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/ukui-system-monitor.pro b/ukui-system-monitor.pro
-index e2999fb..7891cda 100644
---- a/ukui-system-monitor.pro
-+++ b/ukui-system-monitor.pro
-@@ -4,3 +4,14 @@ TEMPLATE = subdirs
- 
- SUBDIRS = \
-     src \
-+
-+guide.files += data/kylin-system-monitor/*
-+guide.path = /usr/share/kylin-user-guide/data/guide/kylin-system-monitor
-+
-+translation.files += src/translation/ukui-system-monitor*.qm
-+translation.path = /usr/share/ukui-system-monitor/translations/
-+
-+
-+INSTALLS += guide \
-+            translation
-+
--- 
-2.33.0
-

0001-modify-version-is-pull.patch

@@ -1,38 +0,0 @@
-From bc027c4e8282a07db893c71f0b5ea72701e99bc3 Mon Sep 17 00:00:00 2001
-From: peijiankang <peijiankang@kylinos.cn>
-Date: Mon, 31 Oct 2022 11:30:15 +0800
-Subject: [PATCH] modify version is pull
-
----
- src/util.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/util.cpp b/src/util.cpp
-index c79d6db..6e88b86 100644
---- a/src/util.cpp
-+++ b/src/util.cpp
-@@ -501,17 +501,17 @@ QString getUsmVersion()
-     QString versionText;
-     QProcess proc;
-     QStringList options;
--    options << "-l" << "|" << "grep" << "ukui-system-monitor";
--    proc.start("dpkg", options);
-+    options << "-qa" << "|" << "grep" << "ukui-system-monitor";
-+    proc.start("rpm", options);
-     proc.waitForFinished();
-     QString dpkgInfo = proc.readAll();
-     QStringList infoList = dpkgInfo.split("\n");
-     for (int n = 0; n < infoList.size(); n++) {
-         QString strInfoLine = infoList[n];
-         if (strInfoLine.contains("ukui-system-monitor")) {
--            QStringList lineInfoList = strInfoLine.split(QRegExp("[\\s]+"));
-+            QStringList lineInfoList = strInfoLine.split(QRegExp("-"));
-             if (lineInfoList.size() >= 3) {
--                versionText = lineInfoList[2];
-+                versionText = lineInfoList[3];
-             }
-             break;
-         }
--- 
-2.36.1
-

ukui-system-monitor.spec

@@ -1,13 +1,13 @@
-Name:          ukui-system-monitor
+%define debug_package %{nil}
-Version:       3.1.2
+Name:           ukui-system-monitor
-Release:       3
+Version:        2.0.10
-Summary:       Monitor for UKUI desktop environment
+Release:        3
-License:       GPL-3+ and GPL-2+
+Summary:        A simple system monitor written in QT
-URL:           http://www.ukui.org
+License:        GPL-3+ GPL-2+
-Source0:       %{name}-%{version}.tar.gz
+URL:            http://www.ukui.org
-Patch01:       0001-modify-version-is-pull.patch
+Source0:        %{name}-%{version}.tar.gz
-Patch02:       0001-fix-compile-error-of-ukui-system-monitor.patch
 
+BuildRequires: cmake >= 2.6
 BuildRequires: qt5-qtbase-devel >= 5.1
 BuildRequires: qt5-qtsvg-devel
 BuildRequires: qt5-qtscript-devel
@@ -15,34 +15,37 @@ BuildRequires: qt5-qttools-devel
 BuildRequires: pkgconf
 BuildRequires: glib2-devel >= 2.46.0
 BuildRequires: libgtop2-devel
-BuildRequires: kf5-kwindowsystem-devel
 BuildRequires: systemd-devel >= 209
 BuildRequires: gsettings-qt-devel
 BuildRequires: qt5-qtx11extras-devel
 BuildRequires: libpcap-devel
-BuildRequires: ukui-interface
+BuildRequires: kf5-kwindowsystem-devel
 BuildRequires: qt5-qtcharts-devel
 BuildRequires: qt5-qtcharts
 
-Requires: libcap-devel
+#Requires: inotify-hookable
-Requires: glib2-devel
+#Requires: bsdutils
+Requires: hdparm
+Requires: lm_sensors
+Requires: ethtool
+Requires: lshw
+Requires: dmidecode
+Requires: kernel-tools
+Requires: pciutils
+Requires: libpcap
 
 %description
- UKUI system monitor allows you to graphically view and manipulate the
+A simple system monitor written in QT
- running processes, It also provides an overview of the resources (such
- as CPU and memory) and File Systems on your system.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 export PATH=%{_qt5_bindir}:$PATH
 mkdir qmake-build
 pushd qmake-build
 %{qmake_qt5} ..
-%{make_build} -j4
+%{make_build}
 popd
 
 %install
@@ -51,77 +54,26 @@ pushd qmake-build
 popd
 
 %post
-setcap "cap_net_admin,cap_net_raw+ep" /usr/bin/ukui-system-monitor &> /dev/null || :
+setcap "cap_net_admin,cap_net_raw+ep" /usr/bin/ukui-system-monitor
-set -e &> /dev/null || :
+set -e
-glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null || :
+glib-compile-schemas /usr/share/glib-2.0/schemas/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc debian/changelog debian/copyright
+%doc debian/changelog
 %{_bindir}/ukui-system-monitor
 %{_datadir}/applications/ukui-system-monitor.desktop
-%{_datadir}/icons/hicolor/*
+%{_datadir}/icons/hicolor/ukui-system-monitor.png
 %{_datadir}/glib-2.0/schemas/org.ukui.system-monitor.menu.gschema.xml
+%{_prefix}/lib64/qt5/plugins/generic/libprocnet-monitor.a
 %{_datadir}/ukui/ukui-system-monitor.conf
-%{_datadir}/kylin-user-guide/data/*
+
-%{_datadir}/ukui-system-monitor/translations/*
 
 %changelog
-* Thu Mar 02 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-3
+* Thu Jan 27 2022 huayadong <huayadong@kylinos.cn> - 2.0.10-1
-- add file kylin-system-monitor for kylin-user-guide
+- update to upstream version 2.0.10-1
-
-* Tue Feb 07 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.2-2
-- Enable debuginfo for fix strip
-
-* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-1
-- update version to 3.1.2
-
-* Fri Jul 29 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.1-18
-- Modify the Chinese translation of the Nice field
-
-* Fri Jul 29 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.1-17
-- Adapt QT5.15 to add a fractional scaling property
-
-* Wed Jun 29 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.1-16
-- add support Tibetan translation
-
-* Wed Jun 29 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.1-15
-- desktop add Tibetan name and introduction
-
-* Wed May 25 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.1-14
-- Improve the project according to the requirements of compliance improvement
-
-* Tue Apr 19 2022 douyan <douyan@kylimos.cn> - 1.0.1-13
-- fix first install post script issue
-
-* Wed Dec 22 2021 pei-jiankang <peijiankang@kylimos.cn> - 1.0.1-12
-- Update changelog
-
-* Tue Dec 21 2021 pei-jiankang <peijiankang@kylimos.cn> - 1.0.1-11
-- Fix the segmentfault without org.ukui.style
-
-* Thu Dec 09 2021 douyan <douyan@kylimos.cn> - 1.0.1-10
-- fix the bug about process and filesystem
-
-* Tue Dec 07 2021 tanyulong <tanyulong@kylimos.cn> - 1.0.1-9
-- Update modification record in changelog
-
-* Tue Nov 09 2021 tanyulong <tanyulong@kylimos.cn> - 1.0.1-8
-- Remove LICENSE which is same with COPYING
-
-* Fri Nov 05 2021 tanyulong <tanyulong@kylimos.cn> - 1.0.1-7
-- Update README.md
-
-* Fri Nov 05 2021 tanyulong <tanyulong@kylimos.cn> - 1.0.1-6
-- Add libglib2.0 bin to Depends
-
-* Tue Nov 02 2021 tanyulong <tanyulong@kylinos.cn> - 1.0.1-5
-- Fix the wrong maintainer and update changelog
-
-* Thu Oct 28 2021 tanyulong <tanyulong@kylinos.cn> - 1.0.1-4
-- add storage check 
 
 * Wed Sep 1 2021 douyan <douyan@kylinos.cn> - 1.0.1-3
 - hide idle rate

ukui-system-monitor.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: https://github.com/ukui/ukui-system-monitor.git
-tag_prefix: "v"
-separator: "."