Accepting request 531202 from GNOME:Factory

(forwarded request 531140 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/531202
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-desktop?expand=0&rev=139

gnome-desktop-3.26.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a99a084ea06fba20f5c547822dd8e36758676714729c7ae7b44ae3deca57be2
-size 1066368

gnome-desktop-3.26.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92fa697af986fb2c6bc6595f0155c968c17e5d1981a50584ff4fb6fd60124e2f
+size 1066824

gnome-desktop-no-usr-merge.patch

@@ -1,35 +0,0 @@
-From 9761561a3bc9dc8665e5f5aca7f7177429f87be2 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Sat, 2 Sep 2017 00:05:23 +0200
-Subject: [PATCH] thumbnailer: also add /lib(64)? to bwrap's link-mounted
- directory list
-
-As not all distros have libs moves from /lib(64)? to /usr/lib(64), we need
-to also bind-mount those directories, or the thumbnailers will fail to load
-the required libraries.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=787072
----
- libgnome-desktop/gnome-desktop-thumbnail-script.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-index 52dbf7b8..89ad5c3b 100644
---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
-+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -506,10 +506,10 @@ add_bwrap (GPtrArray   *array,
-   add_args (array,
- 	    "bwrap",
- 	    "--ro-bind", "/usr", "/usr",
-+	    "--ro-bind", "/lib", "/lib",
-+	    "--ro-bind", "/lib64", "/lib64",
- 	    "--proc", "/proc",
- 	    "--dev", "/dev",
--	    "--symlink", "usr/lib", "/lib",
--	    "--symlink", "usr/lib64", "/lib64",
- 	    "--symlink", "usr/bin", "/bin",
- 	    "--symlink", "usr/sbin", "/sbin",
- 	    "--chdir", "/",
--- 
-2.14.0
-

gnome-desktop.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct  4 10:02:13 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.26.1:
+  + Fix problems with thumbnailer sandboxing (bgo#787072).
+  + Updated translations.
+- Drop gnome-desktop-no-usr-merge.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Mon Sep 11 19:58:43 UTC 2017 - jengelh@inai.de
 

gnome-desktop.spec

@@ -18,7 +18,7 @@
 
 %define IS_DEFAULT_GNOME_DESKTOP 1
 Name:           gnome-desktop
-Version:        3.26.0
+Version:        3.26.1
 Release:        0
 Summary:        The GNOME Desktop API Library
 License:        LGPL-2.1+
@@ -26,8 +26,6 @@ Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/gnome-desktop/3.26/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM gnome-desktop-no-usr-merge.patch bgo#787072 dimstar@opensuse.org -- Also consider /lib(64)? for the bubblewrap
-Patch0:         gnome-desktop-no-usr-merge.patch
 # PATFH-FIX-OPENSUSE gnome-desktop-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
 Patch1:         gnome-desktop-switch-Japanese-default-input-to-mozc.patch
 BuildRequires:  fdupes
@@ -129,7 +127,6 @@ reasons.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %if !0%{?is_opensuse}
 translation-update-upstream