diff --git a/ukui-system-monitor-3.14.0.0.tar.gz b/ukui-system-monitor-3.14.0.0.tar.gz deleted file mode 100644 index df658e5565bc886484e588aa9ae221a0dbfebf4a..0000000000000000000000000000000000000000 Binary files a/ukui-system-monitor-3.14.0.0.tar.gz and /dev/null differ diff --git a/ukui-system-monitor-4.10.0.0-kylin-change-lrelease-to-lrelease-qt5.patch b/ukui-system-monitor-4.10.0.0-kylin-change-lrelease-to-lrelease-qt5.patch new file mode 100644 index 0000000000000000000000000000000000000000..f21e80b7bfe99ee4a44591a6f703af379213954f --- /dev/null +++ b/ukui-system-monitor-4.10.0.0-kylin-change-lrelease-to-lrelease-qt5.patch @@ -0,0 +1,24 @@ +From f15ae4e61a289469ddf39f5ef1d9f4d09994f59b Mon Sep 17 00:00:00 2001 +From: huayadong +Date: Sun, 27 Oct 2024 17:46:13 +0800 +Subject: [PATCH] init + +--- + src/translate_generation.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/translate_generation.sh b/src/translate_generation.sh +index b0aaa24..17c06d3 100755 +--- a/src/translate_generation.sh ++++ b/src/translate_generation.sh +@@ -10,6 +10,6 @@ do + if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then + lrelease-qt5 "${ts}" + else +- lrelease "${ts}" ++ lrelease-qt5 "${ts}" + fi + done +-- +2.43.0 + diff --git a/ukui-system-monitor-4.10.0.0.tar.gz b/ukui-system-monitor-4.10.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..916a9bec09c09efc916d7a5f218e7e6afcdc4379 Binary files /dev/null and b/ukui-system-monitor-4.10.0.0.tar.gz differ diff --git a/ukui-system-monitor.spec b/ukui-system-monitor.spec index 38b81a20fc837ad64155fd9843d40bacf9144afb..f36f9df6cf1cb018468721db90b62e47a4530703 100644 --- a/ukui-system-monitor.spec +++ b/ukui-system-monitor.spec @@ -1,88 +1,111 @@ -Name: ukui-system-monitor -Version: 3.14.0.0 -Release: 2 Summary: Monitor for UKUI desktop environment -License: GPL-3+ and GPL-2+ -URL: http://www.ukui.org +Name: ukui-system-monitor +Version: 4.10.0.0 +Release: 1 +License: GPL-3+ and GPL-2+ and BSD-3-clause +URL: https://www.ukui.org Source0: %{name}-%{version}.tar.gz -BuildRequires: glib2-devel -BuildRequires: gsettings-qt-devel -BuildRequires: libgtop2-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: libpcap-devel -BuildRequires: qt5-qtcharts-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: systemd-devel -BuildRequires: ukui-interface -BuildRequires: pkg-config -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtscript-devel -BuildRequires: qt5-qttools-devel -BuildRequires: libkysdk-utils-devel -BuildRequires: libkysdk-qtwidgets-devel -BuildRequires: libkysdk-waylandhelper -BuildRequires: libkysdk-waylandhelper-devel -BuildRequires: libkysdk-diagnostics-devel +Patch1: ukui-system-monitor-4.10.0.0-kylin-change-lrelease-to-lrelease-qt5.patch + +BuildRequires: glib2-devel >= 2.46.0 +BuildRequires: gsettings-qt-devel +BuildRequires: libgtop2-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: libpcap-devel +BuildRequires: qt5-qtcharts-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: systemd-devel >= 209 +BuildRequires: libukui-log4qt-devel +BuildRequires: pkg-config +BuildRequires: qt5-qtbase-devel >= 5.1 +BuildRequires: qt5-qtscript-devel +BuildRequires: qt5-qttools-devel +BuildRequires: libkysdk-utils-devel >= 1.2.0.5 +BuildRequires: libkysdk-qtwidgets-devel >= 1.0.0kylin12+0429 +BuildRequires: libkysdk-waylandhelper +BuildRequires: libkysdk-waylandhelper-devel +BuildRequires: libkysdk-diagnostics-devel +BuildRequires: libkysdk-hardware >= 2.3.0.0 +BuildRequires: libkysdk-hardware-devel >= 2.3.0.0 +BuildRequires: libkysdk-net >= 2.3.0.0 +BuildRequires: libkysdk-net-devel >= 2.3.0.0 +BuildRequires: libkysdk-sysinfo >= 2.3.0.0 +BuildRequires: libkysdk-sysinfo-devel >= 2.3.0.0 +BuildRequires: libkysdk-proc >= 2.3.0.0 +BuildRequires: libkysdk-proc-devel >= 2.3.0.0 +BuildRequires: libkysdk-realtime >= 2.3.0.0 +BuildRequires: libkysdk-realtime-devel >= 2.3.0.0 BuildRequires: qt5-qtcharts -Requires: libcap -Requires: glib2 +Requires: libcap +Requires: glib2 %description - 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. + 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 +%autosetup -n %{name}-%{version} -p1 + %build -export PATH=%{_qt5_bindir}:$PATH -mkdir qmake-build -pushd qmake-build -%{qmake_qt5} .. -%{make_build} -j4 -popd +%{qmake_qt5} +%{make_build} %install -pushd qmake-build -%{make_install} INSTALL_ROOT=%{buildroot} -popd +make INSTALL_ROOT=%{buildroot} install -mkdir -p $RPM_BUILD_ROOT/usr/share/kylin-user-guide/data/guide -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/ -mkdir -p $RPM_BUILD_ROOT/usr/share/ukui-system-monitor/translations/ -cp -r data/kylin-system-monitor $RPM_BUILD_ROOT/usr/share/kylin-user-guide/data/guide/ -cp -r data/png $RPM_BUILD_ROOT/usr/share/icons/hicolor/ -cp -r src/translation/*.qm $RPM_BUILD_ROOT/usr/share/ukui-system-monitor/translations/ +#ukui-system-monitor +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/kylin-user-guide/data/guide +cp -r data/ukui-system-monitor $RPM_BUILD_ROOT/%{_datadir}/kylin-user-guide/data/guide +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/ +cp -r data/png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/ +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ukui-system-monitor/translations/ +cp -r src/translation/*.qm $RPM_BUILD_ROOT/%{_datadir}/ukui-system-monitor/translations/ +mkdir -p $RPM_BUILD_ROOT%{_datadir}/man/man1/ +gzip -c man/ukui-system-monitor.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/ukui-system-monitor.1.gz %post -setcap "cap_net_admin,cap_net_raw+ep" /usr/bin/ukui-system-monitor &> /dev/null || : -set -e &> /dev/null || : -glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null || : +#!/bin/sh +#wayland环境下需要验证 +#setcap "cap_net_admin,cap_net_raw+ep" /usr/bin/ukui-system-monitor +if [ "$1" = configure ]; then + # 判断是否支持setcap命令 + if command -v setcap > /dev/null; then + if setcap cap_net_admin,cap_net_raw,cap_dac_read_search,cap_sys_ptrace+ep /usr/bin/ukui-system-monitor;then + chmod u-s /usr/bin/ukui-system-monitor + else + echo "Setcap failed, falling back to setuid" >&2 + chmod u+s /usr/bin/ukui-system-monitor + fi + else + echo "Setcap is not installed, falling back to setuid" >&2 + chmod u+s /usr/bin/ukui-system-monitor + fi +fi -%clean -rm -rf $RPM_BUILD_ROOT %files -%doc debian/changelog debian/copyright -%{_datadir}/kylin-user-guide/data/guide/kylin-system-monitor -%{_datadir}/icons/hicolor/png -%{_datadir}/ukui-system-monitor/translations/*.qm +%license debian/copyright +%doc debian/changelog %{_bindir}/ukui-system-monitor %{_datadir}/applications/ukui-system-monitor.desktop %{_datadir}/glib-2.0/schemas/org.ukui.system-monitor.menu.gschema.xml -%{_datadir}/icons/hicolor/ukui-system-monitor.png +%{_datadir}/icons/hicolor/* +%{_datadir}/kylin-user-guide/data/guide/ukui-system-monitor/* +%{_datadir}/man/man1/ukui-system-monitor.1.gz %{_datadir}/ukui/ukui-system-monitor.conf +%{_datadir}/ukui-system-monitor/translations/* %changelog +* Wed Aug 20 2025 douyan - 4.10.0.0-1 +- update to upstream version 4.10.0.0-ok5.18 + * Thu Jun 13 2024 houhongxun - 3.14.0.0-2 - fix wrong runtime dependencies