diff --git a/gnome-system-monitor-3.22.2.tar.xz b/gnome-system-monitor-3.22.2.tar.xz
deleted file mode 100644
index 33be806..0000000
--- a/gnome-system-monitor-3.22.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68a5b097157a6e445fc2467cbaecfede77d00b774c93e8aa69b6f784055dc982
-size 907524
diff --git a/gnome-system-monitor-3.24.0.tar.xz b/gnome-system-monitor-3.24.0.tar.xz
new file mode 100644
index 0000000..194b26b
--- /dev/null
+++ b/gnome-system-monitor-3.24.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4
+size 930956
diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes
index 5a19207..00c0536 100644
--- a/gnome-system-monitor.changes
+++ b/gnome-system-monitor.changes
@@ -1,3 +1,86 @@
+-------------------------------------------------------------------
+Tue Mar 21 09:55:02 UTC 2017 - dimstar@opensuse.org
+
+- Update to version 3.24.0:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Fri Mar 17 12:47:40 UTC 2017 - dimstar@opensuse.org
+
+- Run spec-cleaner:
+ + Add pkgconfig BuildRequires.
+ + Use %make_install instead of %makeinstall.
+ + Add %defattr(-,root,root) to the -lang package.
+
+-------------------------------------------------------------------
+Fri Mar 17 12:34:52 UTC 2017 - jengelh@inai.de
+
+- Use %_smp_mflags for parallel build and limit fdupes to not work
+ across common partitions. Replace old-age $RPM_* by %-macros.
+
+-------------------------------------------------------------------
+Tue Mar 14 18:57:08 UTC 2017 - mgorse@suse.com
+
+- Add gsm-bsc1020294-add-resources-scrollbar.patch: add a
+ scrollbar to the resources tab (bsc#1020294, bgo#778697).
+
+-------------------------------------------------------------------
+Tue Mar 14 08:46:11 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.23.92:
+ + Updated translations.
+- Drop gnome-system-monitor-linking.patch, gnome-common
+ Buildrequires and call to autoreconf: Fixed upstream.
+
+-------------------------------------------------------------------
+Tue Feb 28 10:39:19 UTC 2017 - dimstar@opensuse.org
+
+- Update to version 3.23.91:
+ + Smooth chart setting should only affect cpu chart.
+ + bgo#778776 fixed broken wnck option.
+ + Updated translations.
+- Add gnome-system-monitor-linking.patch: Fix build with
+ -Wl,--as-needed.
+- Add gnome-common Buildrequires and call to autoreconf, as above
+ patch touches the build system.
+
+-------------------------------------------------------------------
+Sun Feb 19 15:47:03 UTC 2017 - zaitor@opensuse.org
+
+- Drop pkgconfig(libwnck-3.0) BuildRequires and no longer pass
+ --enable-wnck to configure, it currently leads to segfaults
+ (bgo#778776).
+- Drop obsolete clean section.
+
+-------------------------------------------------------------------
+Wed Feb 15 09:25:56 UTC 2017 - zaitor@opensuse.org
+
+- Add explicit pkgconfig(giomm-2.4), pkgconfig(glibmm-2.4)
+ BuildRequires and version them, following what configure looks
+ for.
+
+-------------------------------------------------------------------
+Wed Feb 15 09:25:55 UTC 2017 - dimstar@opensuse.org
+
+- Update to version 3.23.90:
+ + Add option to disable smooth (curves) graph (bgo#778470).
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue Nov 22 12:24:29 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 3.23.2:
+ + Use real widget types, eliminate downcasting.
+ + Remove deprecated GtkAlignments.
+ + Use relative positions to the labels to attach the net pickers.
+ + Port to Gio::Settings.
+ + Fixed menu popup problems.
+ + Cgroup reform (bgo#773016).
+ + Simplified resource view structure.
+ + Use unicode in translatable strings.
+ + Do not use deprecated calls.
+ + Updated translations.
+
-------------------------------------------------------------------
Fri Nov 11 10:16:56 UTC 2016 - dimstar@opensuse.org
diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index 547eb88..b5468e7 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -1,7 +1,7 @@
#
# spec file for package gnome-system-monitor
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,28 +17,32 @@
Name: gnome-system-monitor
-Version: 3.22.2
+Version: 3.24.0
Release: 0
-Url: http://www.gnome.org
Summary: A Simple Process Monitor
License: GPL-2.0+
Group: System/GUI/GNOME
-Source0: http://download.gnome.org/sources/gnome-system-monitor/3.22/%{name}-%{version}.tar.xz
+Url: http://www.gnome.org
+Source0: http://download.gnome.org/sources/gnome-system-monitor/3.24/%{name}-%{version}.tar.xz
+# PATCH-FEATURE-UPSTREAM gsm-bsc1020294-add-resources-scrollbar.patch bsc#1020294 bgo#778697 mgorse@suse.com -- add a scrollbar to the resources tab.
+Patch0: gsm-bsc1020294-add-resources-scrollbar.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: intltool
+BuildRequires: pkgconfig
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: yelp-tools
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gdk-x11-3.0)
+BuildRequires: pkgconfig(giomm-2.4) >= 2.46
+BuildRequires: pkgconfig(glibmm-2.4) >= 2.46
BuildRequires: pkgconfig(gmodule-2.0)
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
BuildRequires: pkgconfig(gtkmm-3.0) >= 3.3.18
BuildRequires: pkgconfig(libgtop-2.0) >= 2.28.2
BuildRequires: pkgconfig(librsvg-2.0) >= 2.35
BuildRequires: pkgconfig(libsystemd) >= 44
-BuildRequires: pkgconfig(libwnck-3.0) >= 2.91.0
BuildRequires: pkgconfig(libxml-2.0)
Requires: lsb-release
Recommends: %{name}-lang
@@ -50,26 +54,24 @@ GNOME-system-monitor is a simple process and system monitor for the
GNOME Desktop.
%lang_package
+
%prep
%setup -q
+%patch0 -p1
translation-update-upstream
%build
%configure \
- --enable-wnck \
--enable-systemd
-%__make %{?jobs:-j%jobs} V=1
+make %{?_smp_mflags} V=1
%install
-%makeinstall
-echo DocPath=gnome-system-monitor >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-system-monitor.desktop
+%make_install
+echo DocPath=gnome-system-monitor >> %{buildroot}/%{_datadir}/applications/gnome-system-monitor.desktop
%suse_update_desktop_file %{name}
%suse_update_desktop_file %{name}-kde
%find_lang %{name} %{?no_lang_C}
-%fdupes $RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%fdupes %{buildroot}/%{_prefix}
%post
%desktop_database_post
@@ -98,5 +100,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libexecdir}/%{name}/gsm-renice
%files lang -f %{name}.lang
+%defattr(-,root,root)
%changelog
diff --git a/gsm-bsc1020294-add-resources-scrollbar.patch b/gsm-bsc1020294-add-resources-scrollbar.patch
new file mode 100644
index 0000000..d6d8420
--- /dev/null
+++ b/gsm-bsc1020294-add-resources-scrollbar.patch
@@ -0,0 +1,26 @@
+diff -urp gnome-system-monitor-3.20.1.orig/data/interface.ui gnome-system-monitor-3.20.1/data/interface.ui
+--- gnome-system-monitor-3.20.1.orig/data/interface.ui 2016-02-03 11:11:26.000000000 -0600
++++ gnome-system-monitor-3.20.1/data/interface.ui 2017-02-13 10:57:00.815968998 -0600
+@@ -167,6 +167,13 @@
+
+
+
++
++
++
+
+ resources
+ Resources