Accepting request 421339 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/421339
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=125

gnome-settings-daemon.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Aug 10 02:24:44 UTC 2016 - sckang@suse.com
+
+- Add gnome-settings-daemon-bring-back-updates-plugin.patch:
+  Revert upstream commits fc22a8100fa40533fddfb4338160a20188e46c6b
+  and e3e961c52419df5f2544b24957e71cf3a4c5ef85 to bring back the
+  updates plugin.(bsc#991024)
+
 -------------------------------------------------------------------
 Fri Aug  5 03:38:22 UTC 2016 - mgorse@suse.com
 
@@ -99,13 +107,6 @@ Mon Mar 21 15:09:07 UTC 2016 - dimstar@opensuse.org
 - Update to version 3.20.0:
   + Fix cancellation handling and possible crashes in all plugins.
 
--------------------------------------------------------------------
-Fri Mar 18 17:53:18 UTC 2016 - fezhang@suse.com
-
-- Add gnome-settings-daemon-bnc873545-hide-warnings.patch: Hide the
-  warnings when failed to find a colord instance on SLES
-  (bnc873545).
-
 -------------------------------------------------------------------
 Thu Mar 17 09:53:38 UTC 2016 - dimstar@opensuse.org
 
@@ -678,10 +679,9 @@ Wed May  7 18:59:57 CEST 2014 - sbrabec@suse.cz
 -------------------------------------------------------------------
 Tue May  6 09:14:32 UTC 2014 - fezhang@suse.com
 
-- Disable colord warnings in /var/log/messages (bnc#873545) 
+- Add gnome-settings-daemon-bnc873545-hide-warnings.patch:
-
+  Hide the warnings when failed to find a colord instance
-- added patch:
+  (bnc873545).
-  * gnome-settings-daemon-bnc873545-hide-warnings.patch
 
 -------------------------------------------------------------------
 Mon May  5 15:15:59 UTC 2014 - zaitor@opensuse.org
@@ -706,9 +706,6 @@ Fri May  2 19:20:04 UTC 2014 - mgorse@suse.com
 - Add updates-dont-use-changed-signal-on-UpClient.patch: Changed
   signal no longer exists in upower 0.99. From upstream.
 
-- Update gnome-settings-daemon-upower-backport.patch; no longer
-  try to listen to device-changed signal (bnc#873759).
-
 -------------------------------------------------------------------
 Wed Apr 16 13:05:00 UTC 2014 - zaitor@opensuse.org
 
@@ -722,9 +719,7 @@ Wed Apr 16 13:05:00 UTC 2014 - zaitor@opensuse.org
 Thu Mar 27 03:50:34 UTC 2014 - cxiong@suse.com
 
 - The default blank timeout is too short, set it longer,
-
   see bnc#869685
-
   NOTE: this is actually the delay between screensaver is shown
   (from blank) and return to blank, more precisely, blank and
   monitor off. The instant blanking (not monitor off) when user
@@ -738,16 +733,14 @@ Thu Mar 27 03:24:20 UTC 2014 - cxiong@suse.com
 
 - Fix malformed parts of
   gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch
-
   The main removed part is actually patching a backup file, which
   was created by Patch 19 in spec. Tools like "quilt" would fail
-  to apply this patch, for these
+  to apply this patch, for these tools use
-  tools use "--no-backup-if-mismatch" flag for "patch" and thus
+  "--no-backup-if-mismatch" flag for "patch" and thus Patch 19
-  Patch 19 would not create a backup file. "rpmbuild" don't use
+  would not create a backup file. "rpmbuild" don't use this
-  this "--no-backup-if-mismatch" flag and thus didn't catch this
+  "--no-backup-if-mismatch" flag and thus didn't catch this error
-  error (maybe this is a good time to think whether this flag
+  (maybe this is a good time to think whether this flag should be
-  should be included.)
+  included.)
-
   There are also some other minor clean up.
 
 -------------------------------------------------------------------
@@ -790,7 +783,6 @@ Thu Feb 20 21:38:49 UTC 2014 - mgorse@suse.com
   reportedly being displayed erroneously, and it has been removed
   upstream, since the last recalls date from 2006, so let's
   remove it.
-
 - Added patches:
   * gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch
 
@@ -883,6 +875,7 @@ Fri Feb  7 03:11:01 UTC 2014 - dimstar@opensuse.org
 - Drop gnome-settings-daemon-upower-backport.patch: fixed upstream.
 - Drop gnome-settings-daemon-upower-fix.patch: fixed upstream.
 
+-------------------------------------------------------------------
 Thu Feb  6 15:03:34 UTC 2014 - lpechacek@suse.cz
 
 - Add gnome-settings-daemon-upower-fix.patch: avoid immediate
@@ -892,8 +885,9 @@ Thu Feb  6 15:03:34 UTC 2014 - lpechacek@suse.cz
 -------------------------------------------------------------------
 Fri Dec 20 00:16:59 UTC 2013 - mgorse@suse.com
 
-- Add gnome-settings-daemon-upower-backport.patch: support UPower
+- Add gnome-settings-daemon-upower-backport.patch -- from upstream;
-  version 0.99.
+  support upower 0.99.
+- Up upower-glib dependency.
 
 -------------------------------------------------------------------
 Sat Dec 14 21:42:59 UTC 2013 - zaitor@opensuse.org

gnome-settings-daemon.spec

@@ -47,6 +47,8 @@ Patch22:        gnome-settings-daemon-bnc873545-hide-warnings.patch
 Patch24:        sle-configure-timeout-blank.patch
 # PATCH-FIX-SLE gnome-settings-daemon-initial-keyboard.patch bsc#979051 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME
 Patch29:        gnome-settings-daemon-initial-keyboard.patch
+# PATCH-FIX-OPENSUSE gnome-settings-daemon-bring-back-updates-plugin.patch bsc#991024 sckang@suse.com -- Add the updates plugin back
+Patch31:        gnome-settings-daemon-bring-back-updates-plugin.patch
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
@@ -80,6 +82,9 @@ BuildRequires:  pkgconfig(libnotify) >= 0.7.3
 BuildRequires:  pkgconfig(libpulse) >= 2.0
 BuildRequires:  pkgconfig(libpulse-mainloop-glib) >= 2.0
 BuildRequires:  pkgconfig(librsvg-2.0) >= 2.36.2
+%if 0%{?suse_version} == 1315
+BuildRequires:  pkgconfig(packagekit-glib2)
+%endif
 %if %{with wacom}
 BuildRequires:  pkgconfig(libwacom) >= 0.7
 BuildRequires:  pkgconfig(xorg-wacom)
@@ -146,9 +151,12 @@ gnome-patch-translation-prepare
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch24
+%patch24 -p0
 %patch29 -p1
 %endif
+%if 0%{?suse_version} == 1315
+%patch31 -p1
+%endif
 
 %build
 %if !0%{?is_opensuse}
@@ -225,6 +233,9 @@ rm -rf %{buildroot}
 %{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so
 %endif
 %{_libdir}/gnome-settings-daemon-3.0/libsound.so
+%if 0%{?suse_version} == 1315
+%{_libdir}/gnome-settings-daemon-3.0/libupdates.so
+%endif
 %{_libdir}/gnome-settings-daemon-3.0/libxrandr.so
 %{_libdir}/gnome-settings-daemon-3.0/libxsettings.so
 %{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
@@ -243,6 +254,9 @@ rm -rf %{buildroot}
 # From patch2
 #%%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.proxy.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml
+%if 0%{?suse_version} == 1315
+%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
+%endif
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xrandr.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/gsd-xrandr.*