From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 26 Nov 2019 20:01:10 +0000 (+0100)
Subject: - updated to 3.32.1
X-Git-Tag: auto/th/gnome-system-monitor-3.32.1-1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=9a69ce4a6b4560a9a94e7604eb2856ee3f0555e3;p=packages%2Fgnome-system-monitor.git

- updated to 3.32.1
---

diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index e0c48de..c31e0e6 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -1,50 +1,48 @@
 #
 # Conditional build:
-%bcond_without	systemd		# systemd support
+%bcond_without	systemd	# systemd support
+%bcond_with	wnck	# wnck support, "this will likely make system-monitor segfault"
 #
 Summary:	Simple process monitor
 Summary(pl.UTF-8):	Prosty monitor procesów
 Name:		gnome-system-monitor
-Version:	3.30.0
+Version:	3.32.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/3.30/%{name}-%{version}.tar.xz
-# Source0-md5:	67e589dd973c3d3024ae95665508f9e9
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/3.32/%{name}-%{version}.tar.xz
+# Source0-md5:	37356a1b8c20939adc6f47f739d2e49a
 URL:		http://www.gnome.org/
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-tools >= 0.19.8
 BuildRequires:	glib2-devel >= 1:2.56.0
 BuildRequires:	glibmm-devel >= 2.46.0
-BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gnome-icon-theme >= 3.0.0
 BuildRequires:	gtk+3-devel >= 3.22.0
 BuildRequires:	gtkmm3-devel >= 3.4.0
 BuildRequires:	libgtop-devel >= 1:2.38.0
 BuildRequires:	librsvg-devel >= 2.35.0
 BuildRequires:	libstdc++-devel >= 6:4.7
-BuildRequires:	libtool >= 2:2.2
-BuildRequires:	libwnck-devel >= 3.0.0
+%{?with_wnck:BuildRequires:	libwnck-devel >= 3.0.0}
 BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	libxml2-progs
-BuildRequires:	meson
-BuildRequires:	ninja
+BuildRequires:	meson >= 0.43.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpmbuild(macros) >= 1.736
 %{?with_systemd:BuildRequires:	systemd-devel >= 44}
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRequires:	yelp-tools
-Requires(post,postun):	glib2 >= 1:2.38.0
+Requires(post,postun):	glib2 >= 1:2.56.0
 Requires:	glib2 >= 1:2.56.0
 Requires:	glibmm >= 2.46.0
-Requires:	gnome-icon-theme >= 3.0.0
 Requires:	gtk+3 >= 3.22.0
 Requires:	gtkmm3 >= 3.4.0
+Requires:	hicolor-icon-theme
 Requires:	libgtop >= 1:2.38.0
 Requires:	librsvg >= 2.35.0
 Obsoletes:	procman
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,7 +55,10 @@ GNOME System Monitor to prosty monitor procesów i systemu.
 %setup -q
 
 %build
-%meson build
+%meson build \
+	%{!?with_systemd:-Dsystemd=false} \
+	%{?with_wnck:-Dwnck=true}
+
 %ninja_build -C build
 
 %install
@@ -78,16 +79,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc AUTHORS MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/gnome-system-monitor
 %dir %{_libexecdir}/gnome-system-monitor
 %attr(755,root,root) %{_libexecdir}/gnome-system-monitor/gsm-kill
 %attr(755,root,root) %{_libexecdir}/gnome-system-monitor/gsm-renice
-%{_datadir}/metainfo/gnome-system-monitor.appdata.xml
-%{_desktopdir}/gnome-system-monitor.desktop
-%{_desktopdir}/gnome-system-monitor-kde.desktop
-%{_datadir}/gnome-system-monitor
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-monitor.gschema.xml
+%{_datadir}/gnome-system-monitor
+%{_datadir}/metainfo/gnome-system-monitor.appdata.xml
 %{_datadir}/polkit-1/actions/org.gnome.gnome-system-monitor.policy
-%{_iconsdir}/hicolor/*x*/apps/gnome-system-monitor.png
-%{_iconsdir}/hicolor/symbolic/apps/gnome-system-monitor-symbolic.svg
+%{_desktopdir}/gnome-system-monitor.desktop
+%{_desktopdir}/gnome-system-monitor-kde.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.SystemMonitor.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.SystemMonitor-symbolic.svg