From 8f54110ddb4048ee353f87b28e70cbd1be0758e8 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Jan 09 2019 12:22:14 +0000
Subject: Update to 3.31.4


- Switch to the meson build system

---

diff --git a/.gitignore b/.gitignore
index 2aeee84..0be34da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,4 @@ gnome-desktop-2.90.4.tar.bz2
 /gnome-desktop-3.30.0.tar.xz
 /gnome-desktop-3.30.1.tar.xz
 /gnome-desktop-3.30.2.tar.xz
+/gnome-desktop-3.31.4.tar.xz
diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index 3435f87..02c0aec 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -1,19 +1,23 @@
 %global gdk_pixbuf2_version               2.36.5
 %global gtk3_version                      3.3.6
 %global glib2_version                     2.53.0
-%global gtk_doc_version                   1.14
 %global gsettings_desktop_schemas_version 3.27.0
 %global po_package                        gnome-desktop-3.0
 
 Name: gnome-desktop3
-Version: 3.30.2
+Version: 3.31.4
 Release: 1%{?dist}
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 
 License: GPLv2+ and LGPLv2+
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-desktop/3.30/gnome-desktop-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-desktop/3.31/gnome-desktop-%{version}.tar.xz
 
+BuildRequires: gcc
+BuildRequires: gettext
+BuildRequires: gtk-doc
+BuildRequires: itstool
+BuildRequires: meson
 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version}
 BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@@ -24,9 +28,6 @@ BuildRequires: pkgconfig(iso-codes)
 BuildRequires: pkgconfig(libseccomp)
 BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(xkeyboard-config)
-BuildRequires: gettext
-BuildRequires: gtk-doc >= %{gtk_doc_version}
-BuildRequires: itstool
 
 %if !0%{?flatpak}
 Requires: bubblewrap
@@ -74,14 +75,11 @@ the functionality of the installed %{name} package.
 %autosetup -p1 -n gnome-desktop-%{version}
 
 %build
-%configure --enable-installed-tests
-make %{?_smp_mflags}
+%meson -Dgtk_doc=true -Dinstalled_tests=true
+%meson_build
 
 %install
-%make_install
-
-# stuff we don't want
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%meson_install
 
 %find_lang %{po_package} --all-name --with-gnome
 
@@ -108,6 +106,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_datadir}/installed-tests
 
 %changelog
+* Wed Jan 09 2019 Kalev Lember <klember@redhat.com> - 3.31.4-1
+- Update to 3.31.4
+- Switch to the meson build system
+
 * Sat Oct 27 2018 Kalev Lember <klember@redhat.com> - 3.30.2-1
 - Update to 3.30.2
 
diff --git a/sources b/sources
index 8e34312..c1cb147 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-desktop-3.30.2.tar.xz) = e4cb948cfb9e26ae10472c246293e28f941eead2e4e5c3dde39a21387e0709a25f479178cfa9243ae632dda3b9319bbf02b43387e69c9ff14e9567192faf9133
+SHA512 (gnome-desktop-3.31.4.tar.xz) = f65880b581a2d9d27fc9cceae7b5b3ba6e1421a2d49b1db8aab7b6f10739e0da1ec3a2df69961f17b05d21d2ed93e853b0a4d70f11d02ac4ec63c46b9998f796