From 0429d6e2f6652091dd00cf23e3a81e6b801f75dd281b244c624127ccf93a5b2f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 28 Feb 2017 21:40:23 +0000 Subject: [PATCH] Accepting request 460959 from GNOME:Next Scripted push of GNOME:Next OBS-URL: https://build.opensuse.org/request/show/460959 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-system-monitor?expand=0&rev=153 --- gnome-system-monitor-3.23.90.tar.xz | 3 --- gnome-system-monitor-3.23.91.tar.xz | 3 +++ gnome-system-monitor-linking.patch | 19 +++++++++++++++++++ gnome-system-monitor.changes | 12 ++++++++++++ gnome-system-monitor.spec | 7 ++++++- 5 files changed, 40 insertions(+), 4 deletions(-) delete mode 100644 gnome-system-monitor-3.23.90.tar.xz create mode 100644 gnome-system-monitor-3.23.91.tar.xz create mode 100644 gnome-system-monitor-linking.patch diff --git a/gnome-system-monitor-3.23.90.tar.xz b/gnome-system-monitor-3.23.90.tar.xz deleted file mode 100644 index d3a2fcb..0000000 --- a/gnome-system-monitor-3.23.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a034ac6c080735ac5a4518caa407aeecca2dd122544aa19707500683c74fee2a -size 912128 diff --git a/gnome-system-monitor-3.23.91.tar.xz b/gnome-system-monitor-3.23.91.tar.xz new file mode 100644 index 0000000..d7a5ad9 --- /dev/null +++ b/gnome-system-monitor-3.23.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cb66894f1dbd0e74b1d964628d676e28cd5a59800e098924f754efa43309220 +size 917516 diff --git a/gnome-system-monitor-linking.patch b/gnome-system-monitor-linking.patch new file mode 100644 index 0000000..51ef695 --- /dev/null +++ b/gnome-system-monitor-linking.patch @@ -0,0 +1,19 @@ +Index: gnome-system-monitor-3.23.91/src/Makefile.am +=================================================================== +--- gnome-system-monitor-3.23.91.orig/src/Makefile.am ++++ gnome-system-monitor-3.23.91/src/Makefile.am +@@ -46,11 +46,11 @@ gnome_system_monitor_SOURCES = \ + + # See legacy/Makefile.am for explanation + LDADD = \ ++ legacy/gsm-resources.o \ ++ legacy/libgsmlegacy.la \ + $(GSM_LIBS) \ + $(SYSTEMD_LIBS) \ +- $(WNCK_LIBS) \ +- legacy/gsm-resources.o \ +- legacy/libgsmlegacy.la ++ $(WNCK_LIBS) + + + # GSettings schemas, enum files and conversion file diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes index edbd6c9..2a0a1b3 100644 --- a/gnome-system-monitor.changes +++ b/gnome-system-monitor.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index 5af6eab..6f2f524 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -17,15 +17,18 @@ Name: gnome-system-monitor -Version: 3.23.90 +Version: 3.23.91 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.23/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-system-monitor-linking.patch bgo#779365 dimstar@opensuse.org -- Fix build with -Wl,--as-needed +Patch0: gnome-system-monitor-linking.patch BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -53,9 +56,11 @@ GNOME Desktop. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build +autoreconf -fiv %configure \ --enable-systemd %__make %{?jobs:-j%jobs} V=1