Dominique Leuenberger 2016-09-14 16:53:23 +00:00 committed by Git OBS Bridge
parent 3b8a3e659f
commit 4b894e533e
5 changed files with 32 additions and 8 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28e9167d4aab82b7f6b50d32683a0edae3d91196004dc079ad1940489afee4de
size 1624384

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60de79f0aa8a575e312841870bf9ac3b2292bfd38679c4640ab5b1579fcbce1b
size 1649064

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Wed Sep 14 13:38:34 UTC 2016 - zaitor@opensuse.org
- Update to version 3.21.92.1:
+ Fix a build problem in the smartcard plugin.
-------------------------------------------------------------------
Tue Sep 13 21:06:34 UTC 2016 - zaitor@opensuse.org
- Update to version 3.21.92:
+ Use systemd to track running services in the Sharing plugin.
+ Updated translations.
- Only apply gnome-settings-daemon-shutdown-with-power-button.patch
on SLE and Leap. Following this, conditionally BuildRequires
gnome-common for SLE and Leap only.
- Add gtk-doc BuildRequires: gnome-common was pulling it in before.
- Rename sle-configure-timeout-blank.patch to
gnome-settings-daemon-sle-configure-timeout-blank.patch, align
patchname with our standard.
- Stop passing V=1 to make, we do debugging locally.
-------------------------------------------------------------------
Thu Sep 8 12:39:50 UTC 2016 - zaitor@opensuse.org

View File

@ -30,7 +30,7 @@
%endif
Name: gnome-settings-daemon
Version: 3.21.90
Version: 3.21.92.1
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+
@ -43,8 +43,8 @@ Patch20: gnome-settings-daemon-revert-libinput-mandatory.patch
Patch21: 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
Patch22: gnome-settings-daemon-bnc873545-hide-warnings.patch
# PATCH-FIX-SLE sle-configure-timeout-blank.patch bnc#869685 bgo#710904 cxiong@suse.com -- monitor off timeout is too short, extends it to 5 min
Patch24: sle-configure-timeout-blank.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
Patch24: gnome-settings-daemon-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
@ -53,7 +53,10 @@ Patch31: gnome-settings-daemon-bring-back-updates-plugin.patch
Patch32: gnome-settings-daemon-shutdown-with-power-button.patch
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: gtk-doc
%if 0%{?suse_version} == 1315
BuildRequires: gnome-common
%endif
%if !0%{?is_opensuse}
BuildRequires: gnome-patch-translation
BuildRequires: translation-update-upstream
@ -158,8 +161,8 @@ gnome-patch-translation-prepare
%endif
%if 0%{?suse_version} == 1315
%patch31 -p1
%endif
%patch32 -p1
%endif
%build
%if 0%{?suse_version} == 1315
@ -177,7 +180,7 @@ autoreconf -f -i
%{nil}
# work around a racing condition in plugins/common, which does not always build properly using parallel build
(cd plugins/common; make -j 1 gsd-common-enums.h)
make %{?jobs:-j%jobs} V=1
make %{?jobs:-j%jobs}
%install
%makeinstall