commit deepin-system-monitor for openSUSE:Factory
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-11-08 10:53:57
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1597 (New)
Package is "deepin-system-monitor"
Tue Nov 8 10:53:57 2022 rev:18 rq:1034205 version:5.8.27
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2022-10-28 19:31:35.759252862 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1597/deepin-system-monitor.changes
2022-11-08 10:54:11.173661326 +0100
@@ -1,0 +2,6 @@
+Fri Oct 28 13:04:18 UTC 2022 - Hillwood Yang
+
+- Update version to 5.8.27
+ * Fix a stuck issue
+
+---
@@ -13,0 +20,8 @@
+Sun Jul 3 03:43:12 UTC 2022 - Hillwood Yang
+
+- Update version to 5.8.26
+ * Optimize performance
+ * Fix bug
+ * Update translations
+
+---
Old:
deepin-system-monitor-5.8.22.tar.gz
New:
deepin-system-monitor-5.8.27.tar.gz
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.zV9fgE/_old 2022-11-08 10:54:12.401664216 +0100
+++ /var/tmp/diff_new_pack.zV9fgE/_new 2022-11-08 10:54:12.405664225 +0100
@@ -25,7 +25,7 @@
%defineprocps_version%(rpm -q --queryformat '%%{VERSION}' procps-devel)
Name: deepin-system-monitor
-Version:5.8.22
+Version:5.8.27
Release:0
Summary:A user-friendly system monitor
License:GPL-3.0-or-later
++ deepin-system-monitor-5.8.22.tar.gz ->
deepin-system-monitor-5.8.27.tar.gz ++
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor-5.8.22.tar.gz
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1597/deepin-system-monitor-5.8.27.tar.gz
differ: char 13, line 1
++ deepin-system-monitor.appdata.xml ++
--- /var/tmp/diff_new_pack.zV9fgE/_old 2022-11-08 10:54:12.469664376 +0100
+++ /var/tmp/diff_new_pack.zV9fgE/_new 2022-11-08 10:54:12.477664395 +0100
@@ -20,7 +20,7 @@
https://github.com/linuxdeepin/deepin-system-monitor/
https://github.com/linuxdeepin/deepin-system-monitor/issues/
-
+
GPL-3.0
Linux Deepin
commit deepin-system-monitor for openSUSE:Factory
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-10-28 19:31:11
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2275 (New)
Package is "deepin-system-monitor"
Fri Oct 28 19:31:11 2022 rev:17 rq:1031671 version:5.8.22
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2022-08-03 21:16:57.463482968 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2275/deepin-system-monitor.changes
2022-10-28 19:31:35.759252862 +0200
@@ -1,0 +2,7 @@
+Thu Oct 27 09:11:09 UTC 2022 - Dominique Leuenberger
+
+- Require /usr/bin/pkexec instead of pkexec (the package name):
+ allow the package to install on systems where pkexec has been
+ split out or not.
+
+---
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.nBh9pi/_old 2022-10-28 19:31:36.271255430 +0200
+++ /var/tmp/diff_new_pack.nBh9pi/_new 2022-10-28 19:31:36.275255449 +0200
@@ -82,8 +82,8 @@
BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xtst)
+Requires: /usr/bin/pkexec
Requires: hicolor-icon-theme
-Requires: pkexec
Requires: qt5integration
Recommends: %{name}-lang
commit deepin-system-monitor for openSUSE:Factory
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-08-03 21:16:41
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1533 (New)
Package is "deepin-system-monitor"
Wed Aug 3 21:16:41 2022 rev:16 rq:992421 version:5.8.22
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2022-04-22 21:54:47.066842244 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1533/deepin-system-monitor.changes
2022-08-03 21:16:57.463482968 +0200
@@ -1,0 +2,5 @@
+Mon Jul 18 09:49:45 UTC 2022 - Marcus Meissner
+
+- require pkexec for pkexec binary
+
+---
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.v6PEr7/_old 2022-08-03 21:16:58.003484385 +0200
+++ /var/tmp/diff_new_pack.v6PEr7/_new 2022-08-03 21:16:58.007484395 +0200
@@ -83,6 +83,7 @@
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xtst)
Requires: hicolor-icon-theme
+Requires: pkexec
Requires: qt5integration
Recommends: %{name}-lang
commit deepin-system-monitor for openSUSE:Factory
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-22 21:53:57
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1538 (New)
Package is "deepin-system-monitor"
Fri Apr 22 21:53:57 2022 rev:15 rq:971796 version:5.8.22
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2022-04-08 00:28:27.101828698 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1538/deepin-system-monitor.changes
2022-04-22 21:54:47.066842244 +0200
@@ -1,0 +2,6 @@
+Wed Apr 20 03:17:58 UTC 2022 - Hillwood Yang
+
+- Update version to 5.8.22
+ * Fix bugs
+
+---
Old:
deepin-system-monitor-5.8.21.tar.gz
New:
deepin-system-monitor-5.8.22.tar.gz
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.uTdqum/_old 2022-04-22 21:54:47.958843261 +0200
+++ /var/tmp/diff_new_pack.uTdqum/_new 2022-04-22 21:54:47.966843270 +0200
@@ -25,7 +25,7 @@
%defineprocps_version%(rpm -q --queryformat '%%{VERSION}' procps-devel)
Name: deepin-system-monitor
-Version:5.8.21
+Version:5.8.22
Release:0
Summary:A user-friendly system monitor
License:GPL-3.0-or-later
++ deepin-system-monitor-5.8.21.tar.gz ->
deepin-system-monitor-5.8.22.tar.gz ++
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor-5.8.21.tar.gz
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1538/deepin-system-monitor-5.8.22.tar.gz
differ: char 25, line 1
commit deepin-system-monitor for openSUSE:Factory
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
+
+- 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
+%defineprocps_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}
commit deepin-system-monitor for openSUSE:Factory
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-03-15 19:04:56
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.25692 (New)
Package is "deepin-system-monitor"
Tue Mar 15 19:04:56 2022 rev:13 rq:961881 version:5.8.21
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2022-03-07 17:46:27.427128229 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.25692/deepin-system-monitor.changes
2022-03-15 19:05:45.648982322 +0100
@@ -1,0 +2,5 @@
+Tue Mar 15 13:00:59 UTC 2022 - Hillwood Yang
+
+- change license tag to GPL-3.0-or-later.
+
+---
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.Pqjj0a/_old 2022-03-15 19:05:46.340982791 +0100
+++ /var/tmp/diff_new_pack.Pqjj0a/_new 2022-03-15 19:05:46.348982797 +0100
@@ -26,7 +26,7 @@
Version:5.8.21
Release:0
Summary:A user-friendly system monitor
-License:GPL-3.0-only
+License:GPL-3.0-or-later
Group: System/GUI/Other
URL:https://github.com/linuxdeepin/deepin-system-monitor
Source0:
https://github.com/linuxdeepin/deepin-system-monitor/archive/%{version}/%{name}-%{version}.tar.gz
commit deepin-system-monitor for openSUSE:Factory
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-03-07 17:46:23 Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old) and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1958 (New) Package is "deepin-system-monitor" Mon Mar 7 17:46:23 2022 rev:12 rq:959471 version:5.8.21 Changes: --- /work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes 2022-01-31 22:57:00.053711262 +0100 +++ /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1958/deepin-system-monitor.changes 2022-03-07 17:46:27.427128229 +0100 @@ -1,0 +2,8 @@ +Mon Feb 21 13:01:15 UTC 2022 - Hillwood Yang + +- Update version to 5.8.21 + * Optimize application + * Fix bugs + * Update translations + +--- Old: deepin-system-monitor-5.8.20.tar.gz New: deepin-system-monitor-5.8.21.tar.gz Other differences: -- ++ deepin-system-monitor.spec ++ --- /var/tmp/diff_new_pack.JG6FkB/_old 2022-03-07 17:46:28.287127980 +0100 +++ /var/tmp/diff_new_pack.JG6FkB/_new 2022-03-07 17:46:28.291127979 +0100 @@ -23,7 +23,7 @@ %endif Name: deepin-system-monitor -Version:5.8.20 +Version:5.8.21 Release:0 Summary:A user-friendly system monitor License:GPL-3.0-only ++ deepin-system-monitor-5.8.20.tar.gz -> deepin-system-monitor-5.8.21.tar.gz ++ /work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor-5.8.20.tar.gz /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1958/deepin-system-monitor-5.8.21.tar.gz differ: char 28, line 2 ++ deepin-system-monitor.appdata.xml ++ --- /var/tmp/diff_new_pack.JG6FkB/_old 2022-03-07 17:46:28.347127963 +0100 +++ /var/tmp/diff_new_pack.JG6FkB/_new 2022-03-07 17:46:28.351127962 +0100 @@ -20,7 +20,7 @@ https://github.com/linuxdeepin/deepin-system-monitor/ https://github.com/linuxdeepin/deepin-system-monitor/issues/ - + GPL-3.0 Linux Deepin
commit deepin-system-monitor for openSUSE:Factory
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-01-31 22:56:47
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1898 (New)
Package is "deepin-system-monitor"
Mon Jan 31 22:56:47 2022 rev:11 rq:950164 version:5.8.20
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2021-11-03 17:26:56.409359349 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1898/deepin-system-monitor.changes
2022-01-31 22:57:00.053711262 +0100
@@ -1,0 +2,7 @@
+Sat Jan 29 02:39:15 UTC 2022 - Hillwood Yang
+
+- Update version to 5.8.20
+ * Fix bugs
+ * Drop pannel icon
+
+---
Old:
deepin-system-monitor-5.8.15.tar.gz
New:
deepin-system-monitor-5.8.20.tar.gz
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.EUbE4C/_old 2022-01-31 22:57:00.933705336 +0100
+++ /var/tmp/diff_new_pack.EUbE4C/_new 2022-01-31 22:57:00.937705310 +0100
@@ -1,7 +1,7 @@
#
# spec file for package deepin-system-monitor
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
%endif
Name: deepin-system-monitor
-Version:5.8.15
+Version:5.8.20
Release:0
Summary:A user-friendly system monitor
License:GPL-3.0-only
@@ -88,21 +88,12 @@
deepin-system-monitor is a simple process and system monitor for the Deepin
Desktop.
-%package -n deepin-dock-plugin-system-monitor
-Summary:The system monitor plugin of deepin dock
-Group: System/GUI/Other
-Requires: %{name} = %{version}
-Requires: deepin-dock
-
-%description -n deepin-dock-plugin-system-monitor
-The package provide system monitor plugin for deepin dock
-
%lang_package
%prep
%autosetup -p1
sed -i 's/Exec=deepin-music/Exec=env QT_QPA_PLATFORMTHEME=deepin
deepin-system-monitor/g' \
-deepin-system-monitor-main/translations/desktop/%{name}.desktop
+translations/desktop/%{name}.desktop
%build
%cmake -DVERSION=%{version}-%{distribution}
@@ -119,25 +110,15 @@
%files
%license LICENSE COPYING
%doc README.md CHANGELOG.md
-%config %{_sysconfdir}/xdg/autostart/%{name}-*.desktop
%{_bindir}/%{name}
-%{_bindir}/%{name}-*
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
%{_datadir}/polkit-1/actions/com.deepin.pkexec.%{name}.policy
%{_datadir}/deepin-manual/manual-assets/application/%{name}
-%{_datadir}/glib-2.0/schemas/com.deepin.*
-%{_datadir}/dbus-1/services/com.deepin.SystemMonitor.Daemon.service
-%{_datadir}/dbus-1/services/com.deepin.SystemMonitorPluginPopup.service
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%files -n deepin-dock-plugin-system-monitor
-%dir %{_prefix}/lib/dde-dock
-%dir %{_prefix}/lib/dde-dock/plugins
-%{_prefix}/lib/dde-dock/plugins/libdeepin-system-monitor-plugin.so
-
%files lang -f %{name}.lang
# RPM currently can not handle Asturian
%dir %{_datadir}/deepin-system-monitor
++ deepin-system-monitor-5.8.15.tar.gz ->
deepin-system-monitor-5.8.20.tar.gz ++
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor-5.8.15.tar.gz
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1898/deepin-system-monitor-5.8.20.tar.gz
differ: char 12, line 1
++ fix-return-type-errors.patch ++
--- /var/tmp/diff_new_pack.EUbE4C/_old 2022-01-31 22:57:00.997704906 +0100
+++ /var/tmp/diff_new_pack.EUbE4C/_new 2022-01-31 22:57:00.997704906 +0100
@@ -1,6 +1,6 @@
-diff -Nur
deepin-system-monitor-5.8.15/deepin-system-monitor-main/3rdparty/strutils.c
deepin-system-monitor-5.8.15-new/deepin-system-monitor-main/3rdparty/strutils.c
deepin-system-monitor-5.8.15/deepin-system-monitor-main/3rdparty/strutils.c
2021-09-26 08:59:21.0 +0800
-+++
deepin-system-monitor-5.8.15-new/deepin-system-monitor-main/3rdparty/strutils.c
2021-11-01 16:46:43.414686745 +0800
+diff -Nur deepin-system-monitor-5.8.20/3rdparty/strutils.c
deepin-system-monitor-5.8.20-new/3rdparty/strutils.c
+--- deepin-system-monitor-5.8.20/3rdparty/strutils.c 2021-11-25
14:39:13.0 +0800
deepin-system-monitor-5.8.20-new/3rdparty/strutils.c 2022-01-29
10:27:25.316549598 +0800
@@ -275,6 +275,7 @@
va_end(ap);
commit deepin-system-monitor for openSUSE:Factory
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 2021-11-03 17:26:01
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1890 (New)
Package is "deepin-system-monitor"
Wed Nov 3 17:26:01 2021 rev:10 rq:928898 version:5.8.15
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2021-08-16 10:14:21.934896593 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1890/deepin-system-monitor.changes
2021-11-03 17:26:56.409359349 +0100
@@ -1,0 +2,13 @@
+Mon Nov 1 07:40:22 UTC 2021 - Hillwood Yang
+
+- Update verion to 5.8.15
+ * Optimize for table device
+ * optimize ui
+ * Drop view path feature
+ * Fix bugs
+ * Update translations
+ * Update manual documents
+ * Add the panel icon
+- Add fix-return-type-errors.patch.
+
+---
Old:
deepin-system-monitor-5.8.2.tar.gz
New:
deepin-system-monitor-5.8.15.tar.gz
deepin-system-monitor.svg
fix-return-type-errors.patch
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.JJIqDT/_old 2021-11-03 17:26:56.833359581 +0100
+++ /var/tmp/diff_new_pack.JJIqDT/_new 2021-11-03 17:26:56.837359582 +0100
@@ -23,7 +23,7 @@
%endif
Name: deepin-system-monitor
-Version:5.8.2
+Version:5.8.15
Release:0
Summary:A user-friendly system monitor
License:GPL-3.0-only
@@ -31,11 +31,20 @@
URL:https://github.com/linuxdeepin/deepin-system-monitor
Source0:
https://github.com/linuxdeepin/deepin-system-monitor/archive/%{version}/%{name}-%{version}.tar.gz
Source1:%{name}.appdata.xml
+Source2:%{name}.svg
+# PATCH-FIX-UPSTREAN fix-return-type-errors.patch hillw...@opensuse.org
+Patch0: fix-return-type-errors.patch
+%ifarch ppc ppc64 ppc64le s390 s390x
+BuildRequires: deepin-desktop-base
+%else
+BuildRequires: deepin-manual
+%endif
BuildRequires: appstream-glib
BuildRequires: deepin-gettext-tools
BuildRequires: desktop-file-utils
BuildRequires: dtkcore
BuildRequires: fdupes
+BuildRequires: gmock
BuildRequires: gtest
BuildRequires: hicolor-icon-theme
BuildRequires: libcap-devel
@@ -49,13 +58,17 @@
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(dde-dock)
+BuildRequires: pkgconfig(dframeworkdbus)
BuildRequires: pkgconfig(dtkcore) >= 5.0.0
BuildRequires: pkgconfig(dtkgui) >= 5.0.0
BuildRequires: pkgconfig(dtkwidget) >= 5.0.0
BuildRequires: pkgconfig(dtkwm)
+BuildRequires: pkgconfig(gsettings-qt)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libnl-3.0)
BuildRequires: pkgconfig(libnl-route-3.0)
@@ -75,20 +88,21 @@
deepin-system-monitor is a simple process and system monitor for the Deepin
Desktop.
+%package -n deepin-dock-plugin-system-monitor
+Summary:The system monitor plugin of deepin dock
+Group: System/GUI/Other
+Requires: %{name} = %{version}
+Requires: deepin-dock
+
+%description -n deepin-dock-plugin-system-monitor
+The package provide system monitor plugin for deepin dock
+
%lang_package
%prep
-%setup -q
+%autosetup -p1
sed -i 's/Exec=deepin-music/Exec=env QT_QPA_PLATFORMTHEME=deepin
deepin-system-monitor/g' \
-translations/desktop/%{name}.desktop
-sed -i 's/5.5//g' src/CMakeLists.txt
-
-%if 0%{?suse_version} > 1500
-# Workaround build failure with GCC 10
-sed -e 's|print_err|print_err_system|g' -i src/process/system_stat.cpp
-sed -e 's|print_err|print_err_process|g' -i src/process/process_stat.cpp
-sed -e 's|print_err|print_err_desktop|g' -i src/process/desktop_entry_stat.cpp
-%endif
+deepin-system-monitor-main/translations/desktop/%{name}.desktop
%build
%cmake -DVERSION=%{version}-%{distribution}
@@ -97,6 +111,7 @@
%install
%cmake_install
install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+install -Dm644 %{SOURCE2}
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%find_lang %{name} --with-qt
%suse_update_desktop_file -r %{name} QT System Monitor
%fdupes %{buildroot}%{_datadir}
@@ -104,20 +119,30 @@
%files
%license LICENSE COPYING
%doc README.md CHANGELOG.md
+%config %{_sysconfdir}/xdg/autostart/%{name}-*.desktop
%{_bindir}/%{name}
+%{_bindir}/%{name}-*
%{_datadir}/appdata/%{name}.appdata.xml
commit deepin-system-monitor for openSUSE:Factory
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 2021-08-16 10:09:19
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1899 (New)
Package is "deepin-system-monitor"
Mon Aug 16 10:09:19 2021 rev:9 rq:910948 version:5.8.2
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2021-06-21 20:36:22.906676923 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1899/deepin-system-monitor.changes
2021-08-16 10:14:21.934896593 +0200
@@ -1,0 +2,7 @@
+Tue Jul 27 13:29:09 UTC 2021 - Hillwood Yang
+
+- Update version to 5.8.2
+ * Optimize ui
+ * Fix bugs
+
+---
Old:
deepin-system-monitor-5.8.0.30.tar.gz
New:
deepin-system-monitor-5.8.2.tar.gz
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.8k3zMV/_old 2021-08-16 10:14:22.422895970 +0200
+++ /var/tmp/diff_new_pack.8k3zMV/_new 2021-08-16 10:14:22.426895965 +0200
@@ -23,13 +23,13 @@
%endif
Name: deepin-system-monitor
-Version:5.8.0.30
+Version:5.8.2
Release:0
Summary:A user-friendly system monitor
License:GPL-3.0-only
Group: System/GUI/Other
URL:https://github.com/linuxdeepin/deepin-system-monitor
-Source0:%{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:
https://github.com/linuxdeepin/deepin-system-monitor/archive/%{version}/%{name}-%{version}.tar.gz
Source1:%{name}.appdata.xml
BuildRequires: appstream-glib
BuildRequires: deepin-gettext-tools
@@ -81,12 +81,13 @@
%setup -q
sed -i 's/Exec=deepin-music/Exec=env QT_QPA_PLATFORMTHEME=deepin
deepin-system-monitor/g' \
translations/desktop/%{name}.desktop
+sed -i 's/5.5//g' src/CMakeLists.txt
%if 0%{?suse_version} > 1500
# Workaround build failure with GCC 10
-# sed -e 's|print_err|print_err_system|g' -i src/process/system_stat.cpp
-# sed -e 's|print_err|print_err_process|g' -i src/process/process_stat.cpp
-# sed -e 's|print_err|print_err_desktop|g' -i
src/process/desktop_entry_stat.cpp
+sed -e 's|print_err|print_err_system|g' -i src/process/system_stat.cpp
+sed -e 's|print_err|print_err_process|g' -i src/process/process_stat.cpp
+sed -e 's|print_err|print_err_desktop|g' -i src/process/desktop_entry_stat.cpp
%endif
%build
@@ -106,7 +107,6 @@
%{_bindir}/%{name}
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/deepin-manual
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
%{_datadir}/polkit-1/actions/com.deepin.pkexec.%{name}.policy
++ deepin-system-monitor-5.8.0.30.tar.gz ->
deepin-system-monitor-5.8.2.tar.gz ++
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor-5.8.0.30.tar.gz
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1899/deepin-system-monitor-5.8.2.tar.gz
differ: char 13, line 1
commit deepin-system-monitor for openSUSE:Factory
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 2021-06-21 20:35:56
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2625 (New)
Package is "deepin-system-monitor"
Mon Jun 21 20:35:56 2021 rev:8 rq:901173 version:5.8.0.30
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2021-06-02 22:11:09.468124460 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2625/deepin-system-monitor.changes
2021-06-21 20:36:22.906676923 +0200
@@ -1,0 +2,11 @@
+Tue Jun 8 11:16:01 UTC 2021 - Ferdinand Thiessen
+
+- Update to version 5.8.0.30
+ * Update translations.
+ * Fix: Download size in system monitor process list is greater
+than the total received data.
+ * Fix: When connecting to wireless network, the network data
+cannot be monitored in the process list.
+- Use find_lang macro
+
+---
Old:
deepin-system-monitor-5.8.0.27.tar.gz
New:
deepin-system-monitor-5.8.0.30.tar.gz
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.juZ2gm/_old 2021-06-21 20:36:23.474677643 +0200
+++ /var/tmp/diff_new_pack.juZ2gm/_new 2021-06-21 20:36:23.478677648 +0200
@@ -23,13 +23,13 @@
%endif
Name: deepin-system-monitor
-Version:5.8.0.27
+Version:5.8.0.30
Release:0
Summary:A user-friendly system monitor
License:GPL-3.0-only
Group: System/GUI/Other
URL:https://github.com/linuxdeepin/deepin-system-monitor
-Source0:
https://github.com/linuxdeepin/deepin-system-monitor/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:%{url}/archive/%{version}/%{name}-%{version}.tar.gz
Source1:%{name}.appdata.xml
BuildRequires: appstream-glib
BuildRequires: deepin-gettext-tools
@@ -96,14 +96,13 @@
%install
%cmake_install
install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
-
+%find_lang %{name} --with-qt
%suse_update_desktop_file -r %{name} QT System Monitor
%fdupes %{buildroot}%{_datadir}
%files
-%defattr(-,root,root,-)
-%doc README.md CHANGELOG.md
%license LICENSE COPYING
+%doc README.md CHANGELOG.md
%{_bindir}/%{name}
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
@@ -113,9 +112,12 @@
%{_datadir}/polkit-1/actions/com.deepin.pkexec.%{name}.policy
%dir %{_datadir}/icons/hicolor/scalable/apps
%{_datadir}/icons/hicolor/scalable/apps/deepin-system-monitor.svg
-
-%files lang
-%defattr(-,root,root,-)
-%{_datadir}/%{name}
+%dir %{_datadir}/deepin-system-monitor
+%dir %{_datadir}/deepin-system-monitor/translations
+%{_datadir}/deepin-system-monitor/translations/deepin-system-monitor.qm
+
+%files lang -f %{name}.lang
+# RPM currently can not handle Asturian
+%lang(ast)
%{_datadir}/deepin-system-monitor/translations/deepin-system-monitor_ast.qm
%changelog
++ deepin-system-monitor-5.8.0.27.tar.gz ->
deepin-system-monitor-5.8.0.30.tar.gz ++
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor-5.8.0.27.tar.gz
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2625/deepin-system-monitor-5.8.0.30.tar.gz
differ: char 13, line 1
commit deepin-system-monitor for openSUSE:Factory
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 2021-06-02 22:10:57
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1898 (New)
Package is "deepin-system-monitor"
Wed Jun 2 22:10:57 2021 rev:7 rq:891667 version:5.8.0.27
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2021-03-03 18:33:59.111338919 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1898/deepin-system-monitor.changes
2021-06-02 22:11:09.468124460 +0200
@@ -1,0 +2,10 @@
+Thu May 6 07:10:41 UTC 2021 - Hillwood Yang
+
+- Update version to 5.8.0.27
+ * Update translations
+ * Fix bugs
+ * Support gcc 10+
+ * Add user guide documents
+- Enable policykit feature, fix boo#1181886
+
+---
Old:
deepin-system-monitor-5.8.0.9.tar.gz
deepin-system-monitor-root.desktop
New:
deepin-system-monitor-5.8.0.27.tar.gz
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.YOzcSE/_old 2021-06-02 22:11:10.080124409 +0200
+++ /var/tmp/diff_new_pack.YOzcSE/_new 2021-06-02 22:11:10.080124409 +0200
@@ -16,8 +16,14 @@
#
+%if 0%{?is_opensuse}
+%define distribution openSUSE-Edition
+%else
+%define distribution SUSE-Edition
+%endif
+
Name: deepin-system-monitor
-Version:5.8.0.9
+Version:5.8.0.27
Release:0
Summary:A user-friendly system monitor
License:GPL-3.0-only
@@ -25,7 +31,6 @@
URL:https://github.com/linuxdeepin/deepin-system-monitor
Source0:
https://github.com/linuxdeepin/deepin-system-monitor/archive/%{version}/%{name}-%{version}.tar.gz
Source1:%{name}.appdata.xml
-Source2:%{name}-root.desktop
BuildRequires: appstream-glib
BuildRequires: deepin-gettext-tools
BuildRequires: desktop-file-utils
@@ -52,7 +57,10 @@
BuildRequires: pkgconfig(dtkwidget) >= 5.0.0
BuildRequires: pkgconfig(dtkwm)
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)
BuildRequires: pkgconfig(xcb-icccm)
@@ -76,25 +84,20 @@
%if 0%{?suse_version} > 1500
# Workaround build failure with GCC 10
-sed -e 's|print_err|print_err_system|g' -i src/process/system_stat.cpp
-sed -e 's|print_err|print_err_process|g' -i src/process/process_stat.cpp
-sed -e 's|print_err|print_err_desktop|g' -i src/process/desktop_entry_stat.cpp
+# sed -e 's|print_err|print_err_system|g' -i src/process/system_stat.cpp
+# sed -e 's|print_err|print_err_process|g' -i src/process/process_stat.cpp
+# sed -e 's|print_err|print_err_desktop|g' -i
src/process/desktop_entry_stat.cpp
%endif
%build
-%cmake
+%cmake -DVERSION=%{version}-%{distribution}
%make_build
%install
%cmake_install
install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
-install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/
-
-# Should be reviewed by security team first, workaround boo#1181886
-rm -rf %{buildroot}%{_datadir}/polkit-1
%suse_update_desktop_file -r %{name} QT System Monitor
-%suse_update_desktop_file -r %{name}-root QT System Monitor
%fdupes %{buildroot}%{_datadir}
%files
@@ -104,10 +107,10 @@
%{_bindir}/%{name}
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/applications/%{name}-root.desktop
-# %dir %{_datadir}/polkit-1
-# %dir %{_datadir}/polkit-1/actions
-# %{_datadir}/polkit-1/actions/com.deepin.pkexec.%{name}.policy
+%{_datadir}/deepin-manual
+%dir %{_datadir}/polkit-1
+%dir %{_datadir}/polkit-1/actions
+%{_datadir}/polkit-1/actions/com.deepin.pkexec.%{name}.policy
%dir %{_datadir}/icons/hicolor/scalable/apps
%{_datadir}/icons/hicolor/scalable/apps/deepin-system-monitor.svg
++ deepin-system-monitor-5.8.0.9.tar.gz ->
deepin-system-monitor-5.8.0.27.tar.gz ++
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor-5.8.0.9.tar.gz
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1898/deepin-system-monitor-5.8.0.27.tar.gz
differ: char 13, line 1
commit deepin-system-monitor for openSUSE:Factory
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 2021-03-03 18:33:34
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2378 (New)
Package is "deepin-system-monitor"
Wed Mar 3 18:33:34 2021 rev:6 rq:873452 version:5.8.0.9
Changes:
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2020-06-25 15:10:47.449998392 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.2378/deepin-system-monitor.changes
2021-03-03 18:33:59.111338919 +0100
@@ -1,0 +2,11 @@
+Thu Feb 4 14:45:58 UTC 2021 - Hillwood Yang
+
+- Update version to 5.8.0.9
+ * Use new dtk apis
+ * The new ui design
+- Drop deepin-system-monitor-Qt-5_15.patch, fixed by upstream
+- Drop Fix-redefinition-error.patch, merged by upstream
+- Don't install polkit profiles, install deepin-system-monitor-root.desktop
+ instead. Workaround boo#1181886
+
+---
Old:
Fix-redefinition-error.patch
deepin-system-monitor-1.5.2.tar.gz
deepin-system-monitor-Qt-5_15.patch
New:
deepin-system-monitor-5.8.0.9.tar.gz
deepin-system-monitor-root.desktop
Other differences:
--
++ deepin-system-monitor.spec ++
--- /var/tmp/diff_new_pack.NrGkRL/_old 2021-03-03 18:33:59.991339558 +0100
+++ /var/tmp/diff_new_pack.NrGkRL/_new 2021-03-03 18:33:59.995339561 +0100
@@ -1,7 +1,7 @@
#
# spec file for package deepin-system-monitor
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: deepin-system-monitor
-Version:1.5.2
+Version:5.8.0.9
Release:0
Summary:A user-friendly system monitor
License:GPL-3.0-only
@@ -25,60 +25,77 @@
URL:https://github.com/linuxdeepin/deepin-system-monitor
Source0:
https://github.com/linuxdeepin/deepin-system-monitor/archive/%{version}/%{name}-%{version}.tar.gz
Source1:%{name}.appdata.xml
-# PATCH-FIX-UPSTEAM Fix-redefinition-error.patch hillw...@opensuse.org - Fix
redefinition of 'struct std::hash' error
-Patch0: Fix-redefinition-error.patch
-# PATCH-FIX-UPSTEAM deepin-system-monitor-Qt-5_15.patch hillw...@opensuse.org
- Support Qt 5.15
-Patch1: %{name}-Qt-5_15.patch
+Source2:%{name}-root.desktop
BuildRequires: appstream-glib
+BuildRequires: deepin-gettext-tools
BuildRequires: desktop-file-utils
BuildRequires: dtkcore
BuildRequires: fdupes
+BuildRequires: gtest
BuildRequires: hicolor-icon-theme
BuildRequires: libcap-devel
BuildRequires: libpcap-devel
BuildRequires: libqt5-linguist
BuildRequires: ncurses-devel
BuildRequires: update-desktop-files
+BuildRequires: cmake(Qt5LinguistTools)
+BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
-BuildRequires: pkgconfig(dtkwidget)
+BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(dtkcore) >= 5.0.0
+BuildRequires: pkgconfig(dtkgui) >= 5.0.0
+BuildRequires: pkgconfig(dtkwidget) >= 5.0.0
BuildRequires: pkgconfig(dtkwm)
+BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libprocps)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
+BuildRequires: pkgconfig(xcb-icccm)
BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xtst)
Requires: hicolor-icon-theme
+Requires: qt5integration
Recommends: %{name}-lang
%description
-deepin-system-monitor is a simple process and system monitor for the
-Deepin Desktop.
+deepin-system-monitor is a simple process and system monitor for the Deepin
+Desktop.
%lang_package
%prep
%setup -q
-%patch0 -p1
+sed -i 's/Exec=deepin-music/Exec=env QT_QPA_PLATFORMTHEME=deepin
deepin-system-monitor/g' \
+translations/desktop/%{name}.desktop
+
%if 0%{?suse_version} > 1500
-%patch1 -p1
+# Workaround build failure with GCC 10
+sed -e 's|print_err|print_err_system|g' -i src/process/system_stat.cpp
+sed -e 's|print_err|print_err_process|g' -i src/process/process_stat.cpp
+sed -e 's|print_err|print_err_desktop|g' -i src/process/desktop_entry_stat.cpp
%endif
-sed -i 's/lrelease/lrelease-qt5/g' translations/translate_generation.sh
%build
-%qmake5 PREFIX=%{_prefix}
-make %{?_smp_mflags}
