From da278564312539df29c191605a662b01c44562c6756b550775e0c148e2cb67ed Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 20 Sep 2016 23:37:21 +0000 Subject: [PATCH] - Update to version 1.16.0. OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/mate-system-monitor?expand=0&rev=23 --- mate-system-monitor-1.14.1.tar.xz | 3 --- mate-system-monitor-1.16.0.tar.xz | 3 +++ mate-system-monitor-gtk3.10.patch | 28 ---------------------------- mate-system-monitor.changes | 7 +++++++ mate-system-monitor.spec | 15 ++++----------- 5 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 mate-system-monitor-1.14.1.tar.xz create mode 100644 mate-system-monitor-1.16.0.tar.xz delete mode 100644 mate-system-monitor-gtk3.10.patch diff --git a/mate-system-monitor-1.14.1.tar.xz b/mate-system-monitor-1.14.1.tar.xz deleted file mode 100644 index aa747ad..0000000 --- a/mate-system-monitor-1.14.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fe7dd5456947797780fce60c78bcdbcc849830e1573d40fcb9bd757c650f11d -size 2147808 diff --git a/mate-system-monitor-1.16.0.tar.xz b/mate-system-monitor-1.16.0.tar.xz new file mode 100644 index 0000000..d1fef87 --- /dev/null +++ b/mate-system-monitor-1.16.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abbbfeba699f73a6eacb7545927693daba4fb6203a75170a93df4842cacd9fe1 +size 2120984 diff --git a/mate-system-monitor-gtk3.10.patch b/mate-system-monitor-gtk3.10.patch deleted file mode 100644 index 611b24e..0000000 --- a/mate-system-monitor-gtk3.10.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -32,7 +32,7 @@ GLIB_REQUIRED=2.36.0 - LIBGTOP_REQUIRED=2.23.1 - GIOMM_REQUIRED=2.26.0 - GLIBMM_REQUIRED=2.22 --GTK_REQUIRED=3.14.0 -+GTK_REQUIRED=3.10.0 - GTKMM_REQUIRED=3.8.1 - LIBWNCK_REQUIRED=3.0.0 - LIBXML_REQUIRED=2.0 ---- a/src/sysinfo.cpp -+++ b/src/sysinfo.cpp -@@ -767,10 +767,14 @@ procman_create_sysinfo_view(void) - logo = gtk_image_new_from_file(DATADIR "/pixmaps/mate-system-monitor/side.png"); - } - gtk_widget_set_valign (logo, GTK_ALIGN_START); -+#if GTK_CHECK_VERSION (3, 12, 0) - gtk_widget_set_margin_start (logo, 5); - gtk_widget_set_margin_end (logo, 5); - gtk_widget_set_margin_top (logo, 12); - gtk_widget_set_margin_bottom (logo, 12); -+#else -+ gtk_misc_set_padding (GTK_MISC(logo), 5, 12); -+#endif - gtk_box_pack_start(GTK_BOX(hbox), logo, FALSE, FALSE, 0); - - g_signal_connect(G_OBJECT(logo), "draw", G_CALLBACK(sysinfo_logo_draw), NULL); diff --git a/mate-system-monitor.changes b/mate-system-monitor.changes index 17d1156..260d01e 100644 --- a/mate-system-monitor.changes +++ b/mate-system-monitor.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 20 20:50:25 UTC 2016 - sor.alexei@meowr.ru + +- Update to version 1.16.0: + * Update translations. +- Remove mate-system-monitor-gtk3.10.patch. + ------------------------------------------------------------------- Sun Aug 14 11:23:16 UTC 2016 - sor.alexei@meowr.ru diff --git a/mate-system-monitor.spec b/mate-system-monitor.spec index e4fd075..87d1cb6 100644 --- a/mate-system-monitor.spec +++ b/mate-system-monitor.spec @@ -16,9 +16,9 @@ # -%define _version 1.14 +%define _version 1.16 Name: mate-system-monitor -Version: 1.14.1 +Version: 1.16.0 Release: 0 Summary: MATE Desktop system monitor License: GPL-2.0+ @@ -27,8 +27,6 @@ Url: http://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE mate-system-monitor-xdgsu.patch sor.alexei@meowr.ru -- Use xdg-su instead of gksu. Patch0: %{name}-xdgsu.patch -# PATCH-FIX-OPENSUSE mate-system-monitor-gtk3.10.patch sor.alexei@meowr.ru -Patch1: %{name}-gtk3.10.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libxml2-python @@ -39,20 +37,16 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.10 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 BuildRequires: pkgconfig(gtkmm-3.0) BuildRequires: pkgconfig(libgtop-2.0) BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libwnck-3.0) BuildRequires: pkgconfig(libxml-2.0) Requires: xdg-utils Recommends: %{name}-lang %glib2_gsettings_schema_requires -%if 0%{?suse_version} > 1310 -BuildRequires: pkgconfig(libsystemd) -%else -BuildRequires: pkgconfig(libsystemd-login) -%endif %description Process viewer and system resource monitor for the MATE. This @@ -65,7 +59,6 @@ resources such as CPU and memory. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build NOCONFIGURE=1 mate-autogen