diff --git a/.gitignore b/.gitignore index e88cfff..13055e6 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ gnome-system-monitor-2.28.1.tar.bz2 /gnome-system-monitor-3.31.91.tar.xz /gnome-system-monitor-3.31.92.tar.xz /gnome-system-monitor-3.32.0.tar.xz +/gnome-system-monitor-3.32.1.tar.xz diff --git a/0001-Stop-using-old-icon-name.patch b/0001-Stop-using-old-icon-name.patch deleted file mode 100644 index 26c8baa..0000000 --- a/0001-Stop-using-old-icon-name.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 1a5fe2bfe79886a9f3420e35c283787824b0a0b8 Mon Sep 17 00:00:00 2001 -From: Alexander Mikhaylenko -Date: Fri, 15 Mar 2019 11:19:37 +0500 -Subject: [PATCH] Stop using old icon name - -Fix the name in: -* Window icon -* About dialog -* PolicyKit policy -* KDE desktop file ---- - data/interface.ui | 2 +- - gnome-system-monitor-kde.desktop.in.in | 2 +- - org.gnome.gnome-system-monitor.policy.in.in | 2 +- - src/application.cpp | 2 +- - src/interface.cpp | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/interface.ui b/data/interface.ui -index 9f1e40cf..d136f1dd 100644 ---- a/data/interface.ui -+++ b/data/interface.ui -@@ -6,7 +6,7 @@ - System Monitor - 440 - 495 -- utilities-system-monitor -+ org.gnome.SystemMonitor - - - True -diff --git a/gnome-system-monitor-kde.desktop.in.in b/gnome-system-monitor-kde.desktop.in.in -index 9cb97ad4..23435234 100644 ---- a/gnome-system-monitor-kde.desktop.in.in -+++ b/gnome-system-monitor-kde.desktop.in.in -@@ -4,7 +4,7 @@ Comment=View current processes and monitor system state - TryExec=gnome-system-monitor - Exec=gnome-system-monitor - # Translators: Do NOT translate or transliterate this text (this is an icon file name)! --Icon=utilities-system-monitor -+Icon=org.gnome.SystemMonitor - Terminal=false - Type=Application - StartupNotify=true -diff --git a/org.gnome.gnome-system-monitor.policy.in.in b/org.gnome.gnome-system-monitor.policy.in.in -index 45b5da47..d36e1d5c 100644 ---- a/org.gnome.gnome-system-monitor.policy.in.in -+++ b/org.gnome.gnome-system-monitor.policy.in.in -@@ -5,7 +5,7 @@ - - The GNOME Project - http://www.gnome.org/ -- utilities-system-monitor -+ org.gnome.SystemMonitor - - - Kill process -diff --git a/src/application.cpp b/src/application.cpp -index 9963f46f..5052a40a 100644 ---- a/src/application.cpp -+++ b/src/application.cpp -@@ -400,7 +400,7 @@ void GsmApplication::on_startup() - add_accelerator("Return", "win.process-properties", NULL); - add_accelerator("f", "win.search", g_variant_new_boolean (TRUE)); - -- Gtk::Window::set_default_icon_name ("utilities-system-monitor"); -+ Gtk::Window::set_default_icon_name ("org.gnome.SystemMonitor"); - - glibtop_init (); - -diff --git a/src/interface.cpp b/src/interface.cpp -index 449b4d34..cb2f3f8a 100644 ---- a/src/interface.cpp -+++ b/src/interface.cpp -@@ -390,7 +390,7 @@ on_activate_about (GSimpleAction *, GVariant *, gpointer data) - "copyright", "Copyright \xc2\xa9 2001-2004 Kevin Vandersloot\n" - "Copyright \xc2\xa9 2005-2007 Benoît Dejean\n" - "Copyright \xc2\xa9 2011 Chris Kühl", -- "logo-icon-name", "utilities-system-monitor", -+ "logo-icon-name", "org.gnome.SystemMonitor", - "authors", authors, - "artists", artists, - "documenters", documenters, --- -2.21.0 - diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index 0109f92..35ea280 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -1,15 +1,13 @@ %global libgtop2_version 2.37.2 Name: gnome-system-monitor -Version: 3.32.0 -Release: 2%{?dist} +Version: 3.32.1 +Release: 1%{?dist} Summary: Process and resource monitor License: GPLv2+ URL: http://www.gnome.org/ Source0: http://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-Stop-using-old-icon-name.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -65,6 +63,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit %{_libexecdir}/gnome-system-monitor/ %changelog +* Tue Apr 09 2019 Kalev Lember - 3.32.1-1 +- Update to 3.32.1 + * Fri Mar 15 2019 Kalev Lember - 3.32.0-2 - Backport an upstream patch to use the new icon in various places diff --git a/sources b/sources index 34ee4e6..872c0af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-system-monitor-3.32.0.tar.xz) = 0910d9fd6840a6bacb6e8231aaa0217e4014d4bbdf7e149337bd1bc589ce61cd77709f44d6155418bdbd81cf086100be4d66cabfc2afe387b39fe6ff20f2fd26 +SHA512 (gnome-system-monitor-3.32.1.tar.xz) = badfb98e4508096336bba4be79ce359cf4363649e97c1da534ed96a04de4bc57e12b84ed75bfa9086e00b61b6558ee4af25eee14f0d2636d3ee0b62956122cbd