diff --git a/deepin-system-monitor-5.8.27.tar.gz b/deepin-system-monitor-5.8.27.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..fd7b8f91af9b4f1f7369f832fa5fc74d7c387e53 Binary files /dev/null and b/deepin-system-monitor-5.8.27.tar.gz differ diff --git a/deepin-system-monitor.spec b/deepin-system-monitor.spec index 20319a7addadc0f39b57661986e0e2518cdac968..f2f7fc25f4470edc1f206f098175cebbe0cd756d 100644 --- a/deepin-system-monitor.spec +++ b/deepin-system-monitor.spec @@ -1,69 +1,99 @@ +%global debug_package %{nil} + Name: deepin-system-monitor -Version: 5.6.1 -Release: 1 +Version: 5.8.27 +Release: 1%{?dist}.01 Summary: A more user-friendly system monitor License: GPLv3 URL: https://github.com/linuxdeepin/deepin-system-monitor -Source0: %{name}_%{version}.orig.tar.xz -Source1: %{name}-appdata.xml -Patch0: 0001-fix-building-error.patch +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +BuildRequires: qt5-devel +BuildRequires: cmake + +BuildRequires: pkgconfig(dtkwidget) +BuildRequires: pkgconfig(dtkcore) +BuildRequires: pkgconfig(dtkgui) +# BuildRequires: pkgconfig(dtkwm) -BuildRequires: dtkwidget-devel >= 5.1 BuildRequires: pkgconfig(libprocps) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: qt5-linguist +BuildRequires: xcb-util-wm-devel +# BuildRequires: pkgconfig(Qt5DBus) +# BuildRequires: pkgconfig(Qt5Gui) +# BuildRequires: pkgconfig(Qt5Network) +# BuildRequires: pkgconfig(Qt5Widgets) +# BuildRequires: pkgconfig(Qt5X11Extras) +# BuildRequires: qt5-linguist BuildRequires: libpcap-devel BuildRequires: libcap-devel -BuildRequires: ncurses-devel +# BuildRequires: ncurses-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: deepin-gettext-tools -BuildRequires: dtkwm-devel -BuildRequires: qt5-qtmultimedia-devel -BuildRequires: dtkcore-devel >= 5.1 +# BuildRequires: dtkwm-devel +# BuildRequires: qt5-qtmultimedia-devel +# BuildRequires: dtkcore-devel >= 5.1 BuildRequires: libicu-devel -Requires: hicolor-icon-theme +BuildRequires: libnl3-devel +BuildRequires: systemd-devel +# BuildRequires: pkgconfig(libnl-route-3) +#Requires: hicolor-icon-theme Recommends: deepin-manual %description %{summary}. %prep -%setup -q -%patch0 -p1 +%autosetup +# %setup -q +####sed -i 's|lrelease|lrelease-qt5|' translations/translate_generation.sh + +# %patch0 -p1 %build -export PATH=$PATH:/usr/lib64/qt5/bin -%qmake_qt5 PREFIX=%{_prefix} -%make_build +export PATH=%{_qt5_bindir}:$PATH +sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt") +mkdir build && pushd build +%cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version} +%make_build +popd %install -%make_install INSTALL_ROOT=%{buildroot} -install -Dm644 %SOURCE1 %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +%make_install -C build INSTALL_ROOT="%buildroot" -%check -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: +# %check +# desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: #appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml +%post +if command -v setcap > /dev/null; then + if setcap cap_net_raw,cap_dac_read_search,cap_sys_ptrace+ep /usr/bin/deepin-system-monitor;then + chmod u-s /usr/bin/deepin-system-monitor + else + echo "Setcap failed, falling back to setuid" + chmod u+s /usr/bin/deepin-system-monitor + fi +else + echo "Setcap is not installed, falling back to setuid" + chmod u+s /usr/bin/deepin-system-monitor +fi + %files %doc README.md %license LICENSE %caps(cap_kill,cap_net_raw,cap_dac_read_search,cap_sys_ptrace=+ep) %{_bindir}/%{name} -%{_datadir}/appdata/%{name}.appdata.xml +%{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{_datadir}/%{name}/ +%{_datadir}/%{name}/translations/*.qm %{_datadir}/polkit-1/actions/com.deepin.pkexec.deepin-system-monitor.policy +%{_datadir}/deepin-manual/manual-assets/application/deepin-system-monitor/system-monitor/* %changelog -* Thu Jul 30 2020 openEuler Buildteam - 5.6.1-1 -- Package init +* Mon Jun 13 2022 uoser - 5.8.27-1.01 +- update: update to 5.8.27-1.01 diff --git a/deepin-system-monitor_5.6.1.orig.tar.xz b/deepin-system-monitor_5.6.1.orig.tar.xz deleted file mode 100644 index 011946529c1ef9f5276a2bb7f4d228e416b35498..0000000000000000000000000000000000000000 Binary files a/deepin-system-monitor_5.6.1.orig.tar.xz and /dev/null differ