Update to 3.26.2

We don't have a massive downstream patch collection that requires git to
manage patches. %autosetup -p1 works just as fine for most patches we
need to apply.

.gitignore

@@ -124,3 +124,8 @@ gnome-desktop-2.90.4.tar.bz2
 /gnome-desktop-3.25.3.tar.xz
 /gnome-desktop-3.25.4.tar.xz
 /gnome-desktop-3.25.90.tar.xz
+/gnome-desktop-3.25.91.1.tar.xz
+/gnome-desktop-3.25.92.tar.xz
+/gnome-desktop-3.26.0.tar.xz
+/gnome-desktop-3.26.1.tar.xz
+/gnome-desktop-3.26.2.tar.xz

gnome-desktop-3.25.90-thumbnailer-sandbox-fixes.patch

@@ -1,155 +0,0 @@
-From b5a674a757d4ad934eb505f4e3c50ee1180f3693 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 8 Aug 2017 19:12:51 +0200
-Subject: [PATCH 1/3] thumbnail: Don't crash if the thumbnailer could not be
- setup
-
-script_exec_new() can fail in certain cases, and we should not crash
-when trying to expand the script command later if the initial setup
-failed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785963
----
- libgnome-desktop/gnome-desktop-thumbnail-script.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-index 5a5f05f4..d9437d40 100644
---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
-+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -657,6 +657,9 @@ child_setup (gpointer user_data)
- static void
- script_exec_free (ScriptExec *exec)
- {
-+  if (exec == NULL)
-+    return;
-+
-   g_free (exec->infile);
-   if (exec->outfile)
-     {
-@@ -757,6 +760,8 @@ gnome_desktop_thumbnail_script_exec (const char  *cmd,
-   ScriptExec *exec;
- 
-   exec = script_exec_new (uri);
-+  if (!exec)
-+    goto out;
-   expanded_script = expand_thumbnailing_cmd (cmd, exec, size, error);
-   if (expanded_script == NULL)
-     goto out;
--- 
-2.13.4
-
-
-From 99df9a83a36882d8a666176d9452283ae065d014 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 8 Aug 2017 19:14:09 +0200
-Subject: [PATCH 2/3] thumbnail: Report errors when script_exec_new() fails
-
-Makes it easier to debug.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785963
----
- libgnome-desktop/gnome-desktop-thumbnail-script.c | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-index d9437d40..1012efa8 100644
---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
-+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -687,7 +687,8 @@ clear_fd (gpointer data)
- }
- 
- static ScriptExec *
--script_exec_new (const char *uri)
-+script_exec_new (const char  *uri,
-+		 GError     **error)
- {
-   ScriptExec *exec;
-   g_autoptr(GFile) file = NULL;
-@@ -705,7 +706,11 @@ script_exec_new (const char *uri)
- 
-   exec->infile = g_file_get_path (file);
-   if (!exec->infile)
--    goto bail;
-+    {
-+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
-+                   "Could not get path for URI '%s'", uri);
-+      goto bail;
-+    }
- 
- #ifdef HAVE_BWRAP
-   if (exec->sandbox)
-@@ -719,7 +724,11 @@ script_exec_new (const char *uri)
-       tmpl = g_strdup ("/tmp/gnome-desktop-thumbnailer-XXXXXX");
-       exec->outdir = g_mkdtemp (tmpl);
-       if (!exec->outdir)
--        goto bail;
-+        {
-+          g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-+                               "Could not create temporary sandbox directory");
-+          goto bail;
-+        }
-       exec->outfile = g_build_filename (exec->outdir, "gnome-desktop-thumbnailer.png", NULL);
- 
-       ext = get_extension (exec->infile);
-@@ -732,7 +741,7 @@ script_exec_new (const char *uri)
-       int fd;
-       g_autofree char *tmpname = NULL;
- 
--      fd = g_file_open_tmp (".gnome_desktop_thumbnail.XXXXXX", &tmpname, NULL);
-+      fd = g_file_open_tmp (".gnome_desktop_thumbnail.XXXXXX", &tmpname, error);
-       if (fd == -1)
-         goto bail;
-       close (fd);
-@@ -759,7 +768,7 @@ gnome_desktop_thumbnail_script_exec (const char  *cmd,
-   GBytes *image = NULL;
-   ScriptExec *exec;
- 
--  exec = script_exec_new (uri);
-+  exec = script_exec_new (uri, error);
-   if (!exec)
-     goto out;
-   expanded_script = expand_thumbnailing_cmd (cmd, exec, size, error);
--- 
-2.13.4
-
-
-From f96041679f46ece036d742bde7d78afc67d73519 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 8 Aug 2017 19:20:31 +0200
-Subject: [PATCH 3/3] thumbnail: And print those errors in the debug
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785963
----
- libgnome-desktop/gnome-desktop-thumbnail.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
-index 73751f69..866fc7d2 100644
---- a/libgnome-desktop/gnome-desktop-thumbnail.c
-+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
-@@ -1066,13 +1066,20 @@ gnome_desktop_thumbnail_factory_generate_thumbnail (GnomeDesktopThumbnailFactory
-   if (script)
-     {
-       GBytes *data;
-+      GError *error = NULL;
- 
--      data = gnome_desktop_thumbnail_script_exec (script, size, uri, NULL);
-+      data = gnome_desktop_thumbnail_script_exec (script, size, uri, &error);
-       if (data)
-         {
-           pixbuf = pixbuf_new_from_bytes (data, NULL);
-           g_bytes_unref (data);
-         }
-+      else
-+        {
-+          g_debug ("Thumbnail script ('%s') failed for '%s': %s",
-+                   script, uri, error ? error->message : "no details");
-+          g_clear_error (&error);
-+        }
-     }
- 
-   g_free (script);
--- 
-2.13.4
-

gnome-desktop3.spec

@@ -6,18 +6,15 @@
 %global po_package                        gnome-desktop-3.0
 
 Name: gnome-desktop3
-Version: 3.25.90
+Version: 3.26.2
 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.25/gnome-desktop-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-desktop/3.26/gnome-desktop-%{version}.tar.xz
 Patch0: 0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch
-# Post-release fixes
-Patch1: gnome-desktop-3.25.90-thumbnailer-sandbox-fixes.patch
 
-BuildRequires: gnome-common
 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version}
 BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@@ -25,22 +22,21 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
 BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 BuildRequires: pkgconfig(iso-codes)
+BuildRequires: pkgconfig(libseccomp)
 BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(xkeyboard-config)
-BuildRequires: pkgconfig(libseccomp)
 BuildRequires: gettext
 BuildRequires: gtk-doc >= %{gtk_doc_version}
-BuildRequires: automake autoconf libtool intltool
+BuildRequires: intltool
 BuildRequires: itstool
-BuildRequires: git
 
+Requires: bubblewrap
 Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf2_version}
 Requires: glib2%{?_isa} >= %{glib2_version}
 # Make sure that gnome-themes-standard gets pulled in for upgrades
 Requires: gnome-themes-standard
 # needed for GnomeWallClock
 Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version}
-Requires: bubblewrap
 
 # GnomeIdleMonitor API change breaks older gnome-shell versions
 Conflicts: gnome-shell < 3.7.90
@@ -75,7 +71,7 @@ The %{name}-tests package contains tests that can be used to verify
 the functionality of the installed %{name} package.
 
 %prep
-%autosetup -p1 -S git -n gnome-desktop-%{version}
+%autosetup -p1 -n gnome-desktop-%{version}
 
 %build
 %configure --enable-installed-tests
@@ -116,6 +112,22 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_datadir}/installed-tests
 
 %changelog
+* Wed Nov 01 2017 Kalev Lember <klember@redhat.com> - 3.26.2-1
+- Update to 3.26.2
+
+* Fri Oct 06 2017 Kalev Lember <klember@redhat.com> - 3.26.1-1
+- Update to 3.26.1
+
+* Mon Sep 11 2017 Kalev Lember <klember@redhat.com> - 3.26.0-1
+- Update to 3.26.0
+
+* Thu Sep 07 2017 Kalev Lember <klember@redhat.com> - 3.25.92-1
+- Update to 3.25.92
+
+* Thu Aug 24 2017 Bastien Nocera <bnocera@redhat.com> - 3.25.91.1-1
++ gnome-desktop3-3.25.91.1-1
+- Update to 3.25.91.1
+
 * Wed Aug 09 2017 Bastien Nocera <bnocera@redhat.com> - 3.25.90-1
 + gnome-desktop3-3.25.90-1
 - Update to 3.25.90

sources

@@ -1 +1 @@
-SHA512 (gnome-desktop-3.25.90.tar.xz) = f9ed616e7cd13c5eefcc367dca37ac72220a5a32c6a61ca05e1a407e41b20453e3741e04605b9243c6c2b499db18bf7142c32fb49e99a8e4af0ae25c488f9230
+SHA512 (gnome-desktop-3.26.2.tar.xz) = 1425bead81a63d9d19f09fb8d23cd2611645898a910887c2b6a672bfbec3dd956e29e1d8c5f941d06929febc7734dec0550f7a15336583fcf9be41f1a4e9c783