diff --git a/0001-fix-compile-error-of-ukui-system-monitor.patch b/0001-fix-compile-error-of-ukui-system-monitor.patch new file mode 100644 index 0000000000000000000000000000000000000000..f16bdd08bb219a047689d3219d74ec1d5f000d3c --- /dev/null +++ b/0001-fix-compile-error-of-ukui-system-monitor.patch @@ -0,0 +1,31 @@ +From a8af8a9301234d548992496014257840d1bcb19c Mon Sep 17 00:00:00 2001 +From: peijiankang +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 + diff --git a/0001-modify-version-is-pull.patch b/0001-modify-version-is-pull.patch index 0770bbe2b4a91c85b1527eeeb580c27ac2042ddf..abe31905297240d552692b1bccaed8eae36e1cee 100644 --- a/0001-modify-version-is-pull.patch +++ b/0001-modify-version-is-pull.patch @@ -1,17 +1,17 @@ -From be119641ce721595df071aa33d631784fd28b504 Mon Sep 17 00:00:00 2001 -From: pei-jiankang -Date: Thu, 7 Apr 2022 10:03:06 +0800 +From bc027c4e8282a07db893c71f0b5ea72701e99bc3 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Mon, 31 Oct 2022 11:30:15 +0800 Subject: [PATCH] modify version is pull --- - src/util.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + src/util.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util.cpp b/src/util.cpp -index c5aa3aa..951ffa6 100644 +index c79d6db..6e88b86 100644 --- a/src/util.cpp +++ b/src/util.cpp -@@ -499,20 +499,20 @@ QString getUsmVersion() +@@ -501,17 +501,17 @@ QString getUsmVersion() QString versionText; QProcess proc; QStringList options; @@ -33,11 +33,6 @@ index c5aa3aa..951ffa6 100644 } break; } - } - return versionText; --} -\ No newline at end of file -+} -- -2.33.0 +2.36.1 diff --git a/ukui-system-monitor-2.0.10.tar.gz b/ukui-system-monitor-2.0.10.tar.gz deleted file mode 100644 index 750352beb0fea152f13b9584d66094766c1ccaf4..0000000000000000000000000000000000000000 Binary files a/ukui-system-monitor-2.0.10.tar.gz and /dev/null differ diff --git a/ukui-system-monitor-3.1.2.tar.gz b/ukui-system-monitor-3.1.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f9880b31f5975a0bf1a539a1b49b1ea5cb2aab0e Binary files /dev/null and b/ukui-system-monitor-3.1.2.tar.gz differ diff --git a/ukui-system-monitor.spec b/ukui-system-monitor.spec index beeea638ff5f5a18669b75544030ce77c42c8162..299b5766cce939986ba31f223becf78f820bde61 100644 --- a/ukui-system-monitor.spec +++ b/ukui-system-monitor.spec @@ -1,14 +1,13 @@ -%define debug_package %{nil} -Name: ukui-system-monitor -Version: 2.0.10 -Release: 4 -Summary: A simple system monitor written in QT -License: GPL-3+ GPL-2+ -URL: http://www.ukui.org -Source0: %{name}-%{version}.tar.gz -Patch01: 0001-modify-version-is-pull.patch - -BuildRequires: cmake >= 2.6 +Name: ukui-system-monitor +Version: 3.1.2 +Release: 3 +Summary: Monitor for UKUI desktop environment +License: GPL-3+ and GPL-2+ +URL: http://www.ukui.org +Source0: %{name}-%{version}.tar.gz +Patch01: 0001-modify-version-is-pull.patch +Patch02: 0001-fix-compile-error-of-ukui-system-monitor.patch + BuildRequires: qt5-qtbase-devel >= 5.1 BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtscript-devel @@ -16,38 +15,34 @@ 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: kf5-kwindowsystem-devel +BuildRequires: ukui-interface BuildRequires: qt5-qtcharts-devel BuildRequires: qt5-qtcharts -#Requires: inotify-hookable -#Requires: bsdutils -Requires: hdparm -Requires: lm_sensors -Requires: ethtool -Requires: lshw -Requires: dmidecode -Requires: kernel-tools -Requires: pciutils -Requires: libpcap +Requires: libcap-devel +Requires: glib2-devel %description -A simple system monitor written in QT + UKUI system monitor allows you to graphically view and manipulate the + 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} +%{make_build} -j4 popd %install @@ -55,16 +50,6 @@ pushd qmake-build %{make_install} INSTALL_ROOT=%{buildroot} popd -mkdir -p %{buildroot}/usr/share/ukui-system-monitor/translations -cp -r %{_builddir}/%{name}-%{version}/src/translation/*.qm %{buildroot}/usr/share/ukui-system-monitor/translations/ - -mkdir -p %{buildroot}/usr/share/icons/hicolor -cp -r %{_builddir}/%{name}-%{version}/data/png/ %{buildroot}/usr/share/icons/hicolor/ - -mkdir -p %{buildroot}/usr/share/kylin-user-guide/data/guide/ -cp -r %{_builddir}/%{name}-%{version}/data/kylin-system-monitor %{buildroot}/usr/share/kylin-user-guide/data/guide/ - - %post setcap "cap_net_admin,cap_net_raw+ep" /usr/bin/ukui-system-monitor &> /dev/null || : set -e &> /dev/null || : @@ -79,23 +64,64 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/ukui-system-monitor.desktop %{_datadir}/icons/hicolor/* %{_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 -* Tue Apr 19 2022 douyan - 2.0.10-4 +* Thu Mar 02 2023 peijiankang - 3.1.2-3 +- add file kylin-system-monitor for kylin-user-guide + +* Tue Feb 07 2023 tanyulong - 3.1.2-2 +- Enable debuginfo for fix strip + +* Mon Dec 5 2022 peijiankang - 3.1.2-1 +- update version to 3.1.2 + +* Fri Jul 29 2022 tanyulong - 1.0.1-18 +- Modify the Chinese translation of the Nice field + +* Fri Jul 29 2022 tanyulong - 1.0.1-17 +- Adapt QT5.15 to add a fractional scaling property + +* Wed Jun 29 2022 tanyulong - 1.0.1-16 +- add support Tibetan translation + +* Wed Jun 29 2022 tanyulong - 1.0.1-15 +- desktop add Tibetan name and introduction + +* Wed May 25 2022 tanyulong - 1.0.1-14 +- Improve the project according to the requirements of compliance improvement + +* Tue Apr 19 2022 douyan - 1.0.1-13 - fix first install post script issue -* Thu Apr 7 2022 pei-jiankang - 2.0.10-3 -- modify version is pull +* Wed Dec 22 2021 pei-jiankang - 1.0.1-12 +- Update changelog + +* Tue Dec 21 2021 pei-jiankang - 1.0.1-11 +- Fix the segmentfault without org.ukui.style + +* Thu Dec 09 2021 douyan - 1.0.1-10 +- fix the bug about process and filesystem + +* Tue Dec 07 2021 tanyulong - 1.0.1-9 +- Update modification record in changelog + +* Tue Nov 09 2021 tanyulong - 1.0.1-8 +- Remove LICENSE which is same with COPYING + +* Fri Nov 05 2021 tanyulong - 1.0.1-7 +- Update README.md + +* Fri Nov 05 2021 tanyulong - 1.0.1-6 +- Add libglib2.0 bin to Depends -* Tue Mar 1 2022 douyan - 2.0.10-2 -- add translation file +* Tue Nov 02 2021 tanyulong - 1.0.1-5 +- Fix the wrong maintainer and update changelog -* Thu Jan 27 2022 huayadong - 2.0.10-1 -- update to upstream version 2.0.10-1 +* Thu Oct 28 2021 tanyulong - 1.0.1-4 +- add storage check * Wed Sep 1 2021 douyan - 1.0.1-3 - hide idle rate diff --git a/ukui-system-monitor.yaml b/ukui-system-monitor.yaml new file mode 100644 index 0000000000000000000000000000000000000000..963343d74e809a1cf2c883965ba929b593c284c9 --- /dev/null +++ b/ukui-system-monitor.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: https://github.com/ukui/ukui-system-monitor.git +tag_prefix: "v" +separator: "." \ No newline at end of file