From 4d156b3420537da9ceba1cb91817a5e02dbe21b3 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 7 Sep 2018 13:38:23 +0200
Subject: [PATCH] Update to 3.30.0

- Switch to the meson build system
---
 .gitignore                |  1 +
 gnome-system-monitor.spec | 20 ++++++++++++++------
 sources                   |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 35d5c92..93fdef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,4 @@ gnome-system-monitor-2.28.1.tar.bz2
 /gnome-system-monitor-3.28.0.tar.xz
 /gnome-system-monitor-3.28.1.tar.xz
 /gnome-system-monitor-3.28.2.tar.xz
+/gnome-system-monitor-3.30.0.tar.xz
diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index 0ab7841..59ff062 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -1,15 +1,16 @@
 %global libgtop2_version 2.37.2
 
 Name:           gnome-system-monitor
-Version:        3.28.2
-Release:        2%{?dist}
+Version:        3.30.0
+Release:        1%{?dist}
 Summary:        Process and resource monitor
 
 License:        GPLv2+
 URL:            http://www.gnome.org/
-Source0:        http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
 
 BuildRequires:  gcc
+BuildRequires:  meson
 BuildRequires:  pkgconfig(libgtop-2.0) >= %{libgtop2_version}
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtkmm-3.0)
@@ -21,6 +22,7 @@ BuildRequires:  gettext
 BuildRequires:  itstool
 BuildRequires:  polkit-devel
 
+Requires:       hicolor-icon-theme
 Requires:       libgtop2%{?_isa} >= %{libgtop2_version}
 
 %description
@@ -32,11 +34,11 @@ such as CPU and memory.
 %setup -q
 
 %build
-%configure --enable-systemd
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 %find_lang %{name} --with-gnome
 
@@ -53,11 +55,17 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monit
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.gschema.xml
 %{_datadir}/gnome-system-monitor/
+%{_datadir}/icons/hicolor/*/apps/gnome-system-monitor.png
+%{_datadir}/icons/hicolor/symbolic/apps/gnome-system-monitor-symbolic.svg
 %{_datadir}/metainfo/gnome-system-monitor.appdata.xml
 %{_datadir}/polkit-1/actions/org.gnome.gnome-system-monitor.policy
 %{_libexecdir}/gnome-system-monitor/
 
 %changelog
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 3.30.0-1
+- Update to 3.30.0
+- Switch to the meson build system
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index a9b6d4d..c0f3ae0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-system-monitor-3.28.2.tar.xz) = 8c55e97174c7334b19b8d9ef171d3dc97bdb2de4fb8442471e55ae6a0bbf0608e78eee3aafefda8a4a0375b804e5332dce692f3bd6676b4b623aa5be4c87b948
+SHA512 (gnome-system-monitor-3.30.0.tar.xz) = c33dc510b15019de745a88d3eef12b5a2b19048bda22878988f22c4482f6a26ab20f5913f3104f2cb1b9566f7148a08b53d4e548f71345363273c51840fa2c8a