1
0
Alexei Sorokin 2018-03-11 19:11:50 +00:00 committed by Git OBS Bridge
parent 99eb4a782a
commit 0bbdae4b85
5 changed files with 53 additions and 14 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a2aa5c6364d5deb9e9c3ff0ece65f9485a6039c47d81c0681ae1702523b1ff6
size 2159100

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c5f2ab0884b338cad0819b5e5f3b869e5039e16455db140e8b9afc07a4cf2a15
size 2149220

View File

@ -0,0 +1,16 @@
--- a/configure.ac
+++ b/configure.ac
@@ -28,11 +28,11 @@ LT_PREREQ([2.2])
LT_INIT
# Package dependencies
-GLIB_REQUIRED=2.50.0
+GLIB_REQUIRED=2.48.0
LIBGTOP_REQUIRED=2.23.1
GIOMM_REQUIRED=2.26.0
GLIBMM_REQUIRED=2.22
-GTK_REQUIRED=3.22.0
+GTK_REQUIRED=3.20.0
GTKMM_REQUIRED=3.8.1
LIBWNCK_REQUIRED=3.0.0
LIBXML_REQUIRED=2.0

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Mar 9 19:10:07 UTC 2018 - sor.alexei@meowr.ru
- Update to version 1.20.0:
* Require GTK+ 3.22 and GLib 2.50.
* Avoid deprecated gdk_screen_width/height().
* sysinfo: Avoid deprecated GtkAlignment.
* Fix system logo alignment.
* An implementation of WidthOfScreen and HeightOfScreen.
* process table: Make search case-insensitive.
* procman.cpp: Fix "argument 1 null where non-null expected".
* sysinfo.cpp: Fix "this 'if' clause does not guard..."
* proctable.cpp: Fix "this 'else' clause does not guard..."
* Update translations.
- Add mate-system-monitor-gtk-3.20.patch: Restore GLib 2.48 and GTK+ 3.20 support.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 25 14:20:21 UTC 2017 - sor.alexei@meowr.ru Wed Oct 25 14:20:21 UTC 2017 - sor.alexei@meowr.ru

View File

@ -1,7 +1,7 @@
# #
# spec file for package mate-system-monitor # spec file for package mate-system-monitor
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,20 +16,21 @@
# #
%define _version 1.18 %define _version 1.20
Name: mate-system-monitor Name: mate-system-monitor
Version: 1.18.1 Version: 1.20.0
Release: 0 Release: 0
Summary: MATE Desktop system monitor Summary: MATE Desktop system monitor
License: GPL-2.0+ License: GPL-2.0-or-later
Group: System/GUI/Other Group: System/GUI/Other
Url: https://mate-desktop.org/ Url: https://mate-desktop.org/
Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz 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. # PATCH-FIX-OPENSUSE mate-system-monitor-xdgsu.patch sor.alexei@meowr.ru -- Use xdg-su instead of gksu.
Patch0: %{name}-xdgsu.patch Patch0: mate-system-monitor-xdgsu.patch
# PATCH-FEATURE-OPENSUSE mate-system-monitor-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support.
Patch1: mate-system-monitor-gtk-3.20.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libxml2-python
BuildRequires: mate-common >= %{_version} BuildRequires: mate-common >= %{_version}
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: polkit BuildRequires: polkit
@ -37,9 +38,9 @@ BuildRequires: update-desktop-files
BuildRequires: yelp-tools BuildRequires: yelp-tools
BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(dconf)
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.48
BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 BuildRequires: pkgconfig(gtk+-3.0) >= 3.20
BuildRequires: pkgconfig(gtkmm-3.0) BuildRequires: pkgconfig(gtkmm-3.0) >= 3.20
BuildRequires: pkgconfig(libgtop-2.0) BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
@ -60,6 +61,7 @@ resources such as CPU and memory.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
NOCONFIGURE=1 mate-autogen NOCONFIGURE=1 mate-autogen
@ -76,7 +78,7 @@ make %{?_smp_mflags} V=1
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop
%fdupes %{buildroot}%{_datadir}/ %fdupes %{buildroot}%{_datadir}/
%if 0%{?suse_version} <= 1320 %if 0%{?suse_version} < 1500
%post %post
%desktop_database_post %desktop_database_post
%glib2_gsettings_schema_post %glib2_gsettings_schema_post
@ -87,7 +89,12 @@ make %{?_smp_mflags} V=1
%endif %endif
%files %files
%doc AUTHORS COPYING NEWS %if 0%{?suse_version} >= 1500
%license COPYING
%else
%doc COPYING
%endif
%doc AUTHORS NEWS
%doc %{_datadir}/help/C/%{name}/ %doc %{_datadir}/help/C/%{name}/
%{_bindir}/%{name} %{_bindir}/%{name}
%{_libexecdir}/mate-system-monitor/ %{_libexecdir}/mate-system-monitor/