Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-system-monitor for
openSUSE:Factory checked in at 2022-04-08 00:27:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-system-monitor"
Fri Apr 8 00:27:55 2022 rev:14 rq:967429 version:5.8.21
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2022-03-15 19:05:45.648982322 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1900/deepin-system-monitor.changes
2022-04-08 00:28:27.101828698 +0200
@@ -1,0 +2,5 @@
+Thu Apr 7 06:21:10 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Fix build on Tumbleweed
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-system-monitor.spec ++++++
--- /var/tmp/diff_new_pack.JzqiiE/_old 2022-04-08 00:28:27.793820931 +0200
+++ /var/tmp/diff_new_pack.JzqiiE/_new 2022-04-08 00:28:27.805820796 +0200
@@ -22,6 +22,8 @@
%define distribution SUSE-Edition
%endif
+%define procps_version %(rpm -q --queryformat '%%{VERSION}' procps-devel)
+
Name: deepin-system-monitor
Version: 5.8.21
Release: 0
@@ -51,6 +53,7 @@
BuildRequires: libpcap-devel
BuildRequires: libqt5-linguist
BuildRequires: ncurses-devel
+BuildRequires: procps-devel
BuildRequires: update-desktop-files
BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: pkgconfig(Qt5Concurrent)
@@ -72,7 +75,6 @@
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libnl-3.0)
BuildRequires: pkgconfig(libnl-route-3.0)
-BuildRequires: pkgconfig(libprocps)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
@@ -94,6 +96,9 @@
%autosetup -p1
sed -i 's/Exec=deepin-music/Exec=env QT_QPA_PLATFORMTHEME=deepin
deepin-system-monitor/g' \
translations/desktop/%{name}.desktop
+%if "%{procps_version}" >= "4.0.0"
+sed -i '/find_library/s|procps|proc-2|' src/CMakeLists.txt
+%endif
%build
%cmake -DVERSION=%{version}-%{distribution}