Sync from SLE

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=220

gnome-desktop-bnc896687-benq-pnp-id.patch

@@ -0,0 +1,26 @@
+From 838b67ef580a02f9c5e32d691a212d5d571bc88a Mon Sep 17 00:00:00 2001
+From: Federico Mena Quintero <federico@gnome.org>
+Date: Mon, 4 May 2015 14:55:23 -0500
+Subject: pnp-ids: Add LAP -> BenQ to pnp.ids
+
+https://bugzilla.gnome.org/show_bug.cgi?id=748914
+---
+ libgnome-desktop/pnp.ids | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libgnome-desktop/pnp.ids b/libgnome-desktop/pnp.ids
+index 297c3a9..5e8984c 100644
+--- a/libgnome-desktop/pnp.ids
++++ b/libgnome-desktop/pnp.ids
+@@ -1095,6 +1095,7 @@ LAC	LaCie
+ LAF	Microline
+ LAG	Laguna Systems
+ LAN	Sodeman Lancom Inc
++LAP     BenQ
+ LAS	LASAT Comm. A/S
+ LAV	Lava Computer MFG Inc
+ LBO	Lubosoft
+-- 
+cgit v0.12
+
+

gnome-desktop.changes

@@ -1,9 +1,25 @@
+-------------------------------------------------------------------
+Thu May 26 14:25:12 CDT 2016 - federico@suse.com
+
+- Update to GNOME 3.20.2  Fate#318572
+
 -------------------------------------------------------------------
 Tue May 10 20:33:42 UTC 2016 - zaitor@opensuse.org
 
 - Update to version 3.20.2:
   + No changes.
 
+-------------------------------------------------------------------
+Wed Apr 13 10:31:05 UTC 2016 - idonmez@suse.com
+
+- Update to GNOME 3.20  Fate#318572
+- Refresh gnome-desktop-bnc896687-benq-pnp-id.patch
+- Remove upstream patches:
+  + bnc952146-wall-clock-replace-ratio-with-colon-on-non-UTF-8-locales.patch
+  + gnome-desktop-bgo706229-mouse-cursor.patch
+  + gnome-desktop-bgo719428-fix-leak.patch
+  + gnome-desktop-bgo719928-display-name.patch
+
 -------------------------------------------------------------------
 Tue Apr 12 08:54:36 UTC 2016 - dimstar@opensuse.org
 
@@ -73,6 +89,13 @@ Mon Nov  9 21:30:20 UTC 2015 - zaitor@opensuse.org
 - Update to version 3.18.2:
   + Updated translations.
 
+-------------------------------------------------------------------
+Fri Oct 30 07:53:57 UTC 2015 - cxiong@suse.com
+
+- Added
+  bnc952146-wall-clock-replace-ratio-with-colon-on-non-UTF-8-locales.patch
+  (bnc#952146, bgo#722664).
+
 -------------------------------------------------------------------
 Mon Oct 12 23:48:21 UTC 2015 - zaitor@opensuse.org
 
@@ -136,6 +159,12 @@ Tue May 12 11:25:18 UTC 2015 - zaitor@opensuse.org
 - Update to version 3.16.2:
   + No changes.
 
+-------------------------------------------------------------------
+Tue Apr 28 19:01:31 CDT 2015 - federico@suse.com
+
+- Added gnome-desktop-bnc896687-benq-pnp-id.patch for bnc#896687 -
+  list BenQ monitors in pnp.ids.
+
 -------------------------------------------------------------------
 Wed Apr 15 12:00:56 UTC 2015 - dimstar@opensuse.org
 
@@ -278,6 +307,16 @@ Wed Apr 16 13:02:27 UTC 2014 - zaitor@opensuse.org
     - Initialize GnomeRROutputInfo:rotation to GNOME_RR_ROTATION_0
       (bgo#727023).
 
+-------------------------------------------------------------------
+Thu Mar 27 23:46:39 UTC 2014 - mgorse@suse.com
+
+- Add gnome-desktop-bgo706229-mouse-cursor.patch: fix sometimes
+  invisible mouse cursor.
+- Add gnome-desktop-bgo719428-fix-leak.patch: Fix a GHashTable
+  leak.
+- Add gnome-desktop-bgo719928-display-name.patch: Have gnome-rr
+  copy the display name.
+
 -------------------------------------------------------------------
 Mon Mar 24 15:00:24 UTC 2014 - dimstar@opensuse.org
 

gnome-desktop.spec

@@ -27,6 +27,8 @@ Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/gnome-desktop/3.20/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM gnome-desktop-bnc896687-benq-pnp-id.patch bsc#896687 bgo#748914 federico@suse.com -- Add identifier for BenQ displays
+Patch1:         gnome-desktop-bnc896687-benq-pnp-id.patch
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
@@ -126,6 +128,7 @@ reasons.
 %lang_package
 %prep
 %setup -q
+%patch1 -p1
 translation-update-upstream
 
 %if 0%{?BUILD_FROM_VCS}