From 1dd226125e06e88e73fe103a9f58b6f08b41d3bd81a90d940e1bff61e5b3a5c0 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sat, 4 Mar 2017 16:16:14 +0000
Subject: [PATCH] Accepting request 476922 from GNOME:Next

Update to 3.23.91 - switch to meson

OBS-URL: https://build.opensuse.org/request/show/476922
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=271
---
 nautilus-3.23.90.tar.xz |  3 ---
 nautilus-3.23.91.tar.xz |  3 +++
 nautilus.changes        | 21 +++++++++++++++++++++
 nautilus.spec           | 17 +++++++++--------
 4 files changed, 33 insertions(+), 11 deletions(-)
 delete mode 100644 nautilus-3.23.90.tar.xz
 create mode 100644 nautilus-3.23.91.tar.xz

diff --git a/nautilus-3.23.90.tar.xz b/nautilus-3.23.90.tar.xz
deleted file mode 100644
index 511f420..0000000
--- a/nautilus-3.23.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58813d03798ba95e37b8a2f7d11d752fa75bd8e779c6fa0148c4896a5e6e744a
-size 5173048
diff --git a/nautilus-3.23.91.tar.xz b/nautilus-3.23.91.tar.xz
new file mode 100644
index 0000000..b0b01d8
--- /dev/null
+++ b/nautilus-3.23.91.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:062d973d45059a15b96b5d2d248c55aa4c13961307d43cb93f20bc9691be85d6
+size 3521200
diff --git a/nautilus.changes b/nautilus.changes
index fc38f30..8cd6eb3 100644
--- a/nautilus.changes
+++ b/nautilus.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Sat Mar  4 14:26:19 UTC 2017 - dimstar@opensuse.org
+
+- Update to version 3.23.91:
+  + Fix long-time, hard to reproduce, and common crash on desktop
+    with "auto layout" icons.
+  + Port building system to meson.
+  + Make F2 toggle between selection modes, full file name or only
+    file name withouth extension.
+  + Recent files are now always files that only the user used,
+    rather than any program/daemon like Dropbox updating the access
+    time.
+  + Fix Nautilus tests with extexnsions points.
+  + Fix crash on desktop when refreshing.
+- Use %meson_* macros instead of configure/make/make_install,
+  following upstreams port.
+- Add meson BuildRequires.
+- Remove the 'git' call (using sed) from meson.build: we do not
+  want to update libgd to a random snapshot (and couldn't as we
+  have no internet connection during build).
+
 -------------------------------------------------------------------
 Wed Feb 15 09:20:18 UTC 2017 - dimstar@opensuse.org
 
diff --git a/nautilus.spec b/nautilus.spec
index 7feccbc..fcd385d 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -17,7 +17,7 @@
 
 
 Name:           nautilus
-Version:        3.23.90
+Version:        3.23.91
 Release:        0
 Summary:        File Manager for the GNOME Desktop
 License:        GPL-2.0+
@@ -34,14 +34,15 @@ BuildRequires:  gobject-introspection-devel
 BuildRequires:  gtk-doc
 BuildRequires:  intltool >= 0.50
 BuildRequires:  libselinux-devel
+BuildRequires:  meson >= 0.38
 # We need the %%mime_database_* macros
 BuildRequires:  pkgconfig
 BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(exempi-2.0) >= 2.1.0
 BuildRequires:  pkgconfig(gail-3.0)
-BuildRequires:  pkgconfig(glib-2.0) >= 2.45.7
-BuildRequires:  pkgconfig(gnome-autoar-0) >= 0.1
+BuildRequires:  pkgconfig(glib-2.0) >= 2.51.2
+BuildRequires:  pkgconfig(gnome-autoar-0) >= 0.2.1
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.8.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.21.6
@@ -109,18 +110,18 @@ This package contains development files for nautilus.
 
 %prep
 %setup -q
+sed -i "/git/d" meson.build
 %if !0%{?is_opensuse}
 translation-update-upstream
 %endif
 
 %build
-%configure\
-	--disable-update-mimedb \
-	--enable-gtk-doc
-make %{?_smp_mflags}
+%meson \
+    -D enable-gtk-doc=true
+%meson_build
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%meson_install
 find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file org.gnome.Nautilus
 %suse_update_desktop_file nautilus-autorun-software