[packages/mate-system-monitor] up to 1.14.0
atler
atler at pld-linux.org
Sat Apr 9 21:58:46 CEST 2016
commit 3f9be6b1f7a7d447e0d19b805fef7c2554b64e9a
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Apr 9 21:57:33 2016 +0200
up to 1.14.0
- dropped gtk3 bcond - app is now gtk3 only
- updated BRs
- drop unsupported jv locale
mate-system-monitor.spec | 35 +++++++++++------------------------
1 file changed, 11 insertions(+), 24 deletions(-)
---
diff --git a/mate-system-monitor.spec b/mate-system-monitor.spec
index 19d4849..c32b1da 100644
--- a/mate-system-monitor.spec
+++ b/mate-system-monitor.spec
@@ -1,16 +1,12 @@
-#
-# Conditional build:
-%bcond_with gtk3 # use GTK+ 3.x instead of 2.x
-
Summary: Process and resource monitor for MATE desktop
Summary(pl.UTF-8): Monitor procesów w zasobów dla środowiska MATE
Name: mate-system-monitor
-Version: 1.12.2
+Version: 1.14.0
Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://pub.mate-desktop.org/releases/1.12/%{name}-%{version}.tar.xz
-# Source0-md5: b0408b0bd52b4c6624c1ce9aca5921e2
+Source0: http://pub.mate-desktop.org/releases/1.14/%{name}-%{version}.tar.xz
+# Source0-md5: a76a853a473fcffe32bedd401d61738a
URL: http://mate-desktop.org/
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
@@ -20,17 +16,14 @@ BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-tools >= 0.10.40
BuildRequires: glib2-devel >= 1:2.36.0
BuildRequires: glibmm-devel >= 2.26.0
-%{!?with_gtk3:BuildRequires: gtk+2-devel >= 2:2.20.0}
-%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0.0}
-%{!?with_gtk3:BuildRequires: gtkmm-devel >= 2.22}
-%{?with_gtk3:BuildRequires: gtkmm3-devel >= 3.0.0}
+BuildRequires: gtk+3-devel >= 3.14.0
+BuildRequires: gtkmm3-devel >= 3.8.1
BuildRequires: intltool >= 0.50.1
BuildRequires: libgtop-devel >= 1:2.23.1
BuildRequires: librsvg-devel >= 2.35
BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libtool >= 2:2.2
-%{?with_gtk3:BuildRequires: libwnck-devel >= 3.0.0}
-%{!?with_gtk3:BuildRequires: libwnck2-devel >= 2.5.0}
+BuildRequires: libwnck-devel >= 3.0.0
BuildRequires: libxml2-devel >= 2.0
BuildRequires: mate-common
BuildRequires: pkgconfig >= 1:0.19
@@ -43,14 +36,11 @@ BuildRequires: xz
BuildRequires: yelp-tools
Requires: glib2 >= 1:2.36.0
Requires: glibmm >= 2.26.0
-%{!?with_gtk3:Requires: gtk+2 >= 2:2.20.0}
-%{?with_gtk3:Requires: gtk+3 >= 3.0.0}
-%{!?with_gtk3:Requires: gtkmm >= 2.22}
-%{?with_gtk3:Requires: gtkmm3 >= 3.0.0}
+Requires: gtk+3 >= 3.14.0
+Requires: gtkmm3 >= 3.8.1
Requires: libgtop >= 1:2.23.1
Requires: librsvg >= 2.35
-%{?with_gtk3:Requires: libwnck >= 3.0.0}
-%{!?with_gtk3:Requires: libwnck2 >= 2.5.0}
+Requires: libwnck >= 3.0.0
Requires: mate-desktop
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -76,8 +66,7 @@ zasobów, takich jak procesor i pamięć.
%configure \
--disable-silent-rules \
--disable-static \
- --enable-compile-warnings=minimum \
- %{?with_gtk3:--with-gtk=3.0}
+ --enable-compile-warnings=minimum
%{__make}
@@ -86,11 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/%{name}.convert
-
# not supported by glibc (as of 2.19-3)
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/nah
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/jv
desktop-file-install \
--delete-original \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mate-system-monitor.git/commitdiff/3f9be6b1f7a7d447e0d19b805fef7c2554b64e9a
More information about the pld-cvs-commit
mailing list