Accepting request 754974 from GNOME:Factory
(forwarded request 754314 from dimstar) OBS-URL: https://build.opensuse.org/request/show/754974 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=161
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2fa98b1a6c
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git</param>
|
||||
<param name="changesrevision">864d28138db609469313e6f4062e938d4a477090</param></service></servicedata>
|
||||
<param name="changesrevision">6e26304b6afb9028d733e75d120d5b9b795e61a5</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6416282b068b021e6f7665c3be2fcd051f754aa83d56e74577c2a190b2bbc1e0
|
||||
size 13650445
|
||||
3
gnome-settings-daemon-3.34.1+3.obscpio
Normal file
3
gnome-settings-daemon-3.34.1+3.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:16a6b44083af79fd97144927fb8a220fc3971b1ef1bc0a4b548271ee39af3beb
|
||||
size 13650957
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 5 02:12:43 UTC 2019 - Yifan Jiang <yfjiang@suse.com>
|
||||
|
||||
- Enable the patches for both Leap and SLE (bsc#1158243):
|
||||
+ gnome-settings-daemon-notify-idle-resumed.patch
|
||||
+ gnome-settings-daemon-bnc873545-hide-warnings.patch
|
||||
+ gnome-settings-daemon-sle-configure-timeout-blank.patch
|
||||
+ gnome-settings-daemon-more-power-button-actions.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 29 12:52:13 UTC 2019 - Frederic Crozat <fcrozat@suse.com>
|
||||
|
||||
- Update to version 3.34.1+3:
|
||||
* media-keys: Add guard to map_keybinding()
|
||||
* media-keys: Fix crash on key bindings migration
|
||||
* media-keys: Use X11 display for clipboard
|
||||
- Fix build on s390x (ie without wacom support)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 14:38:45 UTC 2019 - Frederic Crozat <fcrozat@suse.com>
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: gnome-settings-daemon
|
||||
version: 3.34.1+0
|
||||
mtime: 1570896977
|
||||
commit: 864d28138db609469313e6f4062e938d4a477090
|
||||
version: 3.34.1+3
|
||||
mtime: 1573930586
|
||||
commit: 6e26304b6afb9028d733e75d120d5b9b795e61a5
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gnome-settings-daemon
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -28,7 +28,7 @@
|
||||
%endif
|
||||
|
||||
Name: gnome-settings-daemon
|
||||
Version: 3.34.1+0
|
||||
Version: 3.34.1+3
|
||||
Release: 0
|
||||
Summary: Settings daemon for the GNOME desktop
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-only
|
||||
@ -42,16 +42,16 @@ Patch1: gnome-settings-daemon-initial-keyboard.patch
|
||||
Patch2: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar@opensuse.org -- Fix no-return-in-nonvoid-function
|
||||
Patch3: gnome-settings-daemon-bgo793253.patch
|
||||
# PATCH-FEATURE-OPENSUSE 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
|
||||
Patch4: gnome-settings-daemon-notify-idle-resumed.patch
|
||||
# PATCH-FIX-OPENSUSE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES
|
||||
Patch5: gnome-settings-daemon-bnc873545-hide-warnings.patch
|
||||
# PATCH-FIX-OPENSUSE 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
|
||||
Patch6: gnome-settings-daemon-sle-configure-timeout-blank.patch
|
||||
# PATCH-FIX-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions.
|
||||
Patch7: gnome-settings-daemon-more-power-button-actions.patch
|
||||
|
||||
## SLE-only patches start at 1000
|
||||
# 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
|
||||
Patch1000: gnome-settings-daemon-notify-idle-resumed.patch
|
||||
# PATCH-FIX-SLE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES
|
||||
Patch1001: 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
|
||||
Patch1002: 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.
|
||||
Patch1003: gnome-settings-daemon-more-power-button-actions.patch
|
||||
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: fdupes
|
||||
@ -152,13 +152,12 @@ gnome-patch-translation-prepare po %{name}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
# SLE-only patches start at 1000
|
||||
%if !0%{?is_opensuse}
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
%patch1002 -p1
|
||||
%patch1003 -p1
|
||||
# Enable the patches by now for both Leap 15 and SLE 15, meanwhile we should justify the patches upstream.
|
||||
%if 0%{?sle_version} >= 150000
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
@ -276,13 +275,13 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper
|
||||
%{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
|
||||
%{_userunitdir}/gsd-wacom.service
|
||||
%{_userunitdir}/gsd-wacom.target
|
||||
%endif
|
||||
%{_udevrulesdir}/61-gnome-settings-daemon-rfkill.rules
|
||||
%{_userunitdir}/gnome-session-initialized.target.wants/
|
||||
%dir %{_userunitdir}/gnome-session-x11-services.target.wants/
|
||||
%{_userunitdir}/gnome-session-x11-services.target.wants/gsd-xsettings.target
|
||||
%{_userunitdir}/gsd-wacom.service
|
||||
%{_userunitdir}/gsd-wacom.target
|
||||
|
||||
%files devel
|
||||
%doc AUTHORS ChangeLog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user