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 <[email protected]>
+
+- 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 [email protected] - Fix
redefinition of 'struct std::hash<QString>' error
-Patch0: Fix-redefinition-error.patch
-# PATCH-FIX-UPSTEAM deepin-system-monitor-Qt-5_15.patch [email protected]
- 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}
+%cmake
+%make_build
%install
-%qmake5_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
-%fdupes %{buildroot}
+%suse_update_desktop_file -r %{name}-root QT System Monitor
+%fdupes %{buildroot}%{_datadir}
%files
%defattr(-,root,root,-)
@@ -87,10 +104,15 @@
%{_bindir}/%{name}
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/applications/%{name}-root.desktop
+# %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
%files lang
%defattr(-,root,root,-)
-%{_datadir}/%{name}/
+%{_datadir}/%{name}
%changelog
++++++ deepin-system-monitor-1.5.2.tar.gz ->
deepin-system-monitor-5.8.0.9.tar.gz ++++++
++++ 160639 lines of diff (skipped)
++++++ deepin-system-monitor-root.desktop ++++++
[Desktop Entry]
Categories=System;Qt;
Comment=Monitor system process status
Exec=xdg-su -c "env QT_QPA_PLATFORMTHEME=deepin deepin-system-monitor"
GenericName=System Monitor
Icon=deepin-system-monitor
Name=Deepin System Monitor (root)
Type=Application
X-Deepin-Vendor=deepin
# Translations:
# Do not manually modify!
Comment[am_ET]=??? ??????????????? ????????? ????????? ??????????????????
Comment[ar]=???????????? ???????? ???????????????? ????????????????
???????????? ???????????????? ?????????????? ???????????????? ??????????
????????????
Comment[ast]=Monitoriza l'est??u de los procesos del sistema
Comment[bg]=?????????????? ???? ?????????????????????? ????
???????????????????? ??????????????
Comment[ca]=Superviseu l'estat del processador, mem??ria, xarxa, processos i
serveis del sistema
Comment[cs]=Syst??mov?? prost??edky ??? vyu??it?? procesoru, opera??n??
pam??ti, s??t??; stav proces?? a slu??eb
Comment[da]=Overv??g systemets status for CPU, hukommelse, netv??rk, proces og
tjeneste
Comment[de]=System-CPU, Speicher, Netzwerk, Prozess- und Dienststatus
??berwachen
Comment[es]=Monitorice el CPU del sistema, la memoria, la red, el proceso y el
estado del servicio
Comment[es_419]=Estado de proceso del monitor de sistema
Comment[fi]=Tarkkaile j??rjestelm??n prosessorin, muistin, verkon ja
palveluiden tilaa
Comment[fr]=Surveiller le processeur, la m??moire, le r??seau, l'??tat des
processus et des services
Comment[gl_ES]=Estado dos procesos do monitor do sistema
Comment[he]=???????? ?????? ?????????? ????????????
Comment[hr]=Nadzor statusa procesa sustava
Comment[hu]=A rendszer ??llapot??nak figyel??se
Comment[id]=Pantau status proses sistem
Comment[it]=Controlla lo stato della CPU di Sistema, la Memoria, la Rete, i
Processi ed i Servizi
Comment[ja]=Monitor system cpu, memory, network, process and service status
Comment[ko]=????????? CPU, ?????????, ????????????, ???????????? ??? ?????????
?????? ????????????
Comment[lt]=Steb??ti sistemos proces?? b??sen??
Comment[ms]=Pantau status cpu, ingatan, rangkaian, proses dan perkhidmatan
sistem
Comment[ne]=????????????????????? ??????????????????, ??????????????????,
?????????????????????, ??????????????????????????? ??? ????????????
?????????????????? ?????????????????? ???????????????????????????
Comment[nl]=Monitor systeemprocessen, geheugengebruik en achtergronddiensten
Comment[pa]=Monitor system cpu, memory, network, process and service status
Comment[pl]=Monitoruje stan proces??w systemowych
Comment[pt]=Monitorizar a cpu do sistema, mem??ria, rede, processo e estado do
servi??o
Comment[pt_BR]=Monitora o estado do processador, mem??rias, rede, processos e
servi??os do sistema
Comment[ro]=Monitorizarea st??rii proceselor de sistem
Comment[ru]=?????????????????? ?????????????? ????, ????????????, ????????,
???????????????? ?? ??????????????
Comment[sk]=Stav procesu monitorovania syst??mu
Comment[sl]=Stanje izvajanja sistemskega nadzora
Comment[sq]=Monitor system cpu, memory, network, process and service status
Comment[sr]=?????????????? ?????????????? ??????-??, ????????????????,
??????????, ?????????????? ?? ????????????
Comment[sv]=Monitor system cpu, memory, network, process and service status
Comment[tr]=Sistem i??lemci, bellek, a??, i??lem ve hizmet durumunu izle
Comment[ug]=?????????????? ???????????? ?????????????????????? ??????????????
??????????
Comment[uk]=?????????????????????????? ???? ???????????? ??????????????????,
??????'??????, ????????????, ???????????????? ???? ?????????? ??????????????
Comment[zh_CN]=????????????CPU??????????????????????????????????????????
Comment[zh_TW]=????????????CPU?????????????????????????????????????????????
GenericName[am_ET]=???????????? ??????????????????
GenericName[ar]=?????????? ????????????
GenericName[ast]=Monitor del sistema
GenericName[bg]=???????????????? ??????????????
GenericName[ca]=Monitor del sistema
GenericName[cs]=Syst??mov?? prost??edky
GenericName[da]=Systemoverv??gning
GenericName[de]=System Monitor
GenericName[es]=Monitor del sistema
GenericName[es_419]=Monitor del sistema
GenericName[fi]=J??rjestelm??n valvonta
GenericName[fr]=Moniteur syst??me
GenericName[gl_ES]=Monitor do sistema
GenericName[he]=???? ????????????
GenericName[hr]=Nadzor sustava
GenericName[hu]=Rendszer figyel??
GenericName[id]=Pemantau Sistem
GenericName[it]=Gestore Attivit??
GenericName[ja]=System Monitor
GenericName[ko]=????????? ?????????
GenericName[lt]=Sistemos monitorius
GenericName[ms]=Pemantau Sistem
GenericName[nb]=Systemmonitor
GenericName[ne]=????????????????????? ???????????????
GenericName[nl]=Systeemmonitor
GenericName[pa]=System Monitor
GenericName[pl]=Monitor systemu
GenericName[pt]=Monitor do Sistema
GenericName[pt_BR]=Monitor de Sistema
GenericName[ro]=Monitor de sistem
GenericName[ru]=?????????????????? ??????????????
GenericName[sk]=Syst??mov?? Monitor
GenericName[sl]=Sistemski nadzor
GenericName[sq]=System Monitor
GenericName[sr]=?????????????? ??????????????
GenericName[sv]=System Monitor
GenericName[tr]=Sistem ??zleyici
GenericName[ug]=?????????????? ??????????????????????
GenericName[uk]=?????????????? ??????????????
GenericName[zh_CN]=???????????????
GenericName[zh_TW]=???????????????
Name[am_ET]=???????????? ???????????? ??????????????????(root)
Name[ar]=?????????? ???????? ??????????(root)
Name[ast]=Monitor del sistema Deepin (root)
Name[bg]=Deepin ???????????????? ?????????????? (root)
Name[ca]=Monitor del sistema del Deepin (root)
Name[cs]=Syst??mov?? prost??edky (root)
Name[da]=Deepin systemoverv??gning (root)
Name[de]=Deepin System Monitor (root)
Name[es]=Monitor del sistema Deepin (root)
Name[es_419]=Monitor del sistema Deepin (root)
Name[fi]=Deepin j??rjestelm??n valvonta (root)
Name[fr]=Moniteur Syst??me Deepin (root)
Name[gl_ES]=Monitor do sistema do Deepin (root)
Name[he]=???? ???????????? ???? Deepin (root)
Name[hr]=Deepin nadzor sustava (root)
Name[hu]=Deepin Rendszerfigyel?? (root)
Name[id]=Pemantau Sistem Deepin (root)
Name[it]=Gestore Attivit?? di Deepin (root)
Name[ja]=Deepin System Monitor (root)
Name[ko]=Deepin ????????? ?????????(root)
Name[lt]=Deepin sistemos monitorius (root)
Name[ms]=Pemantau Sistem Deepin (root)
Name[ne]=??????????????? ????????????????????? ???????????????(root)
Name[nl]=Deepin Systeemmonitor (root)
Name[pa]=Deepin System Monitor (root)
Name[pl]=Monitor systemu Deepin (root)
Name[pt]=Monitor do Sistema Deepin (root)
Name[pt_BR]=Deepin Monitor de Sistema (root)
Name[ro]=Monitor de sistem Deepin (root)
Name[ru]=?????????????????? ?????????????? Deepin (root)
Name[sk]=Deepin Syst??mov?? Monitor (root)
Name[sl]=Sistemski nadzor Deepin (root)
Name[sq]=Deepin System Monitor (root)
Name[sr]=?????????? ?????????????? ?????????????? (root)
Name[sv]=Deepin System Monitor (root)
Name[tr]=Deepin Sistem ??zleyici (root)
Name[ug]=Deepin ?????????????? ?????????????????????? (root)
Name[uk]=?????????????? ?????????????? Deepin (root)
Name[zh_CN]=?????????????????????(root)
Name[zh_TW]=Deepin ??????????????? (root)
++++++ deepin-system-monitor.appdata.xml ++++++
--- /var/tmp/diff_new_pack.NrGkRL/_old 2021-03-03 18:34:00.311339790 +0100
+++ /var/tmp/diff_new_pack.NrGkRL/_new 2021-03-03 18:34:00.315339793 +0100
@@ -20,7 +20,7 @@
<url
type="homepage">https://github.com/linuxdeepin/deepin-system-monitor/</url>
<url
type="bugtracker">https://github.com/linuxdeepin/deepin-system-monitor/issues/</url>
<releases>
- <release version="1.5.2" date="2019-05-23"></release>
+ <release version="5.8.0.9" date="2020-12-15"></release>
</releases>
<project_license>GPL-3.0</project_license>
<developer_name>Linux Deepin</developer_name>
