Accepting request 598598 from GNOME:Next

- Drop gnome-settings-daemon-bring-back-updates-plugin.patch:
  Deprecated on SLE15 / Leap15.0.
- Disable gnome-settings-daemon-more-power-button-actions.patch on
  Leap.

OBS-URL: https://build.opensuse.org/request/show/598598
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=325
This commit is contained in:
Dominique Leuenberger 2018-04-25 08:12:16 +00:00 committed by Git OBS Bridge
parent 526ad0172b
commit e94dbe6025
3 changed files with 13 additions and 4575 deletions

File diff suppressed because it is too large Load Diff

View File

@ -5,6 +5,14 @@ Fri Apr 13 08:54:24 UTC 2018 - xwang@suse.com
screen input switch, user can enable touch screen input when
screen is off(bsc#1086496, glgo#GNOME/gnome-settings-daemon/#29).
-------------------------------------------------------------------
Sun Apr 8 06:39:20 UTC 2018 - fezhang@suse.com
- Drop gnome-settings-daemon-bring-back-updates-plugin.patch:
Deprecated on SLE15 / Leap15.0.
- Disable gnome-settings-daemon-more-power-button-actions.patch on
Leap.
-------------------------------------------------------------------
Tue Apr 3 07:58:37 UTC 2018 - fezhang@suse.com

View File

@ -32,7 +32,7 @@ Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0-or-later
Group: System/GUI/GNOME
Url: http://www.gnome.org
URL: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-settings-daemon/3.28/%{name}-%{version}.tar.xz
# PATCH-FEATURE-SLE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep
Patch1: gnome-settings-daemon-notify-idle-resumed.patch
@ -40,12 +40,10 @@ Patch1: gnome-settings-daemon-notify-idle-resumed.patch
Patch2: gnome-settings-daemon-bnc873545-hide-warnings.patch
# PATCH-FIX-SLE gnome-settings-daemon-sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@suse.com -- monitor off timeout is too short, extends it to 5 min
Patch3: gnome-settings-daemon-sle-configure-timeout-blank.patch
# PATCH-FIX-SLE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions.
Patch4: gnome-settings-daemon-more-power-button-actions.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-initial-keyboard.patch bsc#979051 boo#1009515 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME
Patch4: 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
Patch5: gnome-settings-daemon-bring-back-updates-plugin.patch
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions.
Patch6: gnome-settings-daemon-more-power-button-actions.patch
Patch5: gnome-settings-daemon-initial-keyboard.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-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.
Patch7: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-timeout-grabbing-keys.patch bgo#792353 fezhang@suse.com -- Retry grabbing media-key accelerators when timed out
@ -103,12 +101,6 @@ Requires: polkit
Recommends: %{name}-lang
# For housekeeping plugin, that uses the nautilus dbus service
Recommends: nautilus
%if 0%{?suse_version} == 1315
BuildRequires: gnome-common
%endif
%if 0%{?suse_version} == 1315
BuildRequires: pkgconfig(packagekit-glib2)
%endif
%if %{with wacom}
BuildRequires: pkgconfig(libwacom) >= 0.7
%endif
@ -159,14 +151,9 @@ gnome-patch-translation-prepare
%patch1 -p1
%patch2 -p1
%patch3
%endif
%patch4 -p1
%if 0%{?suse_version} == 1315
%endif
%patch5 -p1
%endif
%if 0%{?suse_version} == 1315 || !0%{?is_opensuse}
%patch6 -p1
%endif
%patch7 -p1
%patch8 -p1
%patch9 -p1
@ -241,10 +228,6 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt
%endif
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-sound
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
%if 0%{?suse_version} == 1315
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-updates
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Updates.desktop
%endif
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-xsettings
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml
@ -258,11 +241,6 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt
# 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
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.update.policy
%{_libexecdir}/gnome-settings-daemon-3.0/pk-clear-offline-update
%endif
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
# Own the directory since we can't depend on gconf providing them