diff --git a/mate-system-monitor-1.5.0-fix_desktop_file.patch b/mate-system-monitor-1.5.0-fix_desktop_file.patch deleted file mode 100644 index 59e44ae..0000000 --- a/mate-system-monitor-1.5.0-fix_desktop_file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6d06a224d764c5b58127f665b2fcfa7eeac080ee Mon Sep 17 00:00:00 2001 -From: Nelson Marques -Date: Wed, 7 Nov 2012 16:30:59 +0000 -Subject: [PATCH] add missing semi-colon to OnlyShowIn desktop file - ---- - mate-system-monitor.desktop.in.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mate-system-monitor.desktop.in.in b/mate-system-monitor.desktop.in.in -index 78b6353..655e235 100644 ---- a/mate-system-monitor.desktop.in.in -+++ b/mate-system-monitor.desktop.in.in -@@ -8,7 +8,7 @@ Terminal=false - Type=Application - StartupNotify=true - Categories=GTK;System;Monitor; --OnlyShowIn=MATE -+OnlyShowIn=MATE; - X-MATE-Bugzilla-Bugzilla=MATE - X-MATE-Bugzilla-Product=system-monitor - X-MATE-Bugzilla-Component=general --- -1.7.12 - diff --git a/mate-system-monitor-1.5.0.tar.xz b/mate-system-monitor-1.5.0.tar.xz deleted file mode 100644 index a48d257..0000000 --- a/mate-system-monitor-1.5.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfae9e752eeaf1c99230cdb083a97bb0dd5803b173339357a2deefa9f83453e5 -size 1906492 diff --git a/mate-system-monitor.changes b/mate-system-monitor.changes index e8676de..1918f59 100644 --- a/mate-system-monitor.changes +++ b/mate-system-monitor.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jan 24 20:48:32 UTC 2013 - nmo.marques@gmail.com + +- Update to version 1.5.1 + + fix gsettings key names + + gsettings schema translatable + + add missing semi-colon to desktop file + + fix first 5 original cpu colors + + minor other fixes +- Remove mate-system-monitor-1.5.0-fix_desktop_file.patch, + upstreamed + ------------------------------------------------------------------- Wed Nov 7 16:31:59 UTC 2012 - nmo.marques@gmail.com diff --git a/mate-system-monitor.spec b/mate-system-monitor.spec index b4f96ff..43b616b 100644 --- a/mate-system-monitor.spec +++ b/mate-system-monitor.spec @@ -1,4 +1,3 @@ -# # spec file for mate-system-monitor # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. @@ -17,7 +16,7 @@ Name: mate-system-monitor -Version: 1.5.0 +Version: 1.5.1 Release: 0 License: GPL-2.0+ Summary: MATE Desktop system monitor @@ -29,10 +28,6 @@ Source1: side-openSUSE.png BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires -# PATCH-FIX-UPSTREAM mate-system-monitor-1.5.0-fix_desktop_file.patch nmarques@mate-desktop.org -# add missing semi-colon to OnlyShowIn in desktop file - upstreamed -Patch0: %{name}-1.5.0-fix_desktop_file.patch - BuildRequires: gcc-c++ BuildRequires: fdupes BuildRequires: libxml2-python @@ -65,7 +60,6 @@ as CPU and memory. %prep %setup -q -%patch0 -p1 %build NOCONFIGURE=1 ./autogen.sh @@ -84,6 +78,9 @@ if [ -f %{buildroot}%{_datadir}/pixmaps/%{name}/side.png ]; then rm %{buildroot}%{_datadir}/pixmaps/%{name}/side.png install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/pixmaps/%{name}/side.png fi +if [ -d %{buildroot}%{_datadir}/MateConf ]; then + rm -r %{buildroot}%{_datadir}/MateConf +fi %post %glib2_gsettings_schema_post