From 032a05faf06473578ba3fba9227657c756cc8b900f8cb2669980ad72ff8ab517 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 14 Aug 2017 14:27:58 +0000 Subject: [PATCH] Accepting request 515184 from home:oertel:branches:GNOME:Factory - run autoreconf if running update-translations and add the missing buildrequires - dont apply gnome-settings-daemon-revert-libinput-mandatory.patch on sle15 OBS-URL: https://build.opensuse.org/request/show/515184 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=294 --- gnome-settings-daemon.changes | 8 ++++++++ gnome-settings-daemon.spec | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index f476405..efff0c2 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 8 13:55:19 CEST 2017 - ro@suse.de + +- run autoreconf if running update-translations and add the + missing buildrequires +- dont apply gnome-settings-daemon-revert-libinput-mandatory.patch + on sle15 + ------------------------------------------------------------------- Mon Jul 31 11:19:54 UTC 2017 - fezhang@suse.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 722ea81..9a41bf9 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -58,7 +58,10 @@ BuildRequires: gtk-doc BuildRequires: gnome-common %endif %if !0%{?is_opensuse} +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gnome-patch-translation +BuildRequires: libtool BuildRequires: translation-update-upstream %endif BuildRequires: intltool @@ -117,7 +120,7 @@ Requires: polkit Recommends: %{name}-lang # For housekeeping plugin, that uses the nautilus dbus service Recommends: nautilus -%if 0%{?is_opensuse} +%if 0%{?is_opensuse} || 0%{?suse_version} == 1500 # g-s-d only support configurtion of libinput based pointer drivers now. Recommends: xf86-input-libinput Recommends: iio-sensor-proxy @@ -154,7 +157,9 @@ contact the settings daemon via its DBus interface. %if !0%{?is_opensuse} translation-update-upstream gnome-patch-translation-prepare +%if 0%{?suse_version} < 1500 %patch0 -p1 +%endif %patch1 -p1 %patch2 -p1 %patch3 -p0 @@ -166,7 +171,8 @@ gnome-patch-translation-prepare %endif %build -%if 0%{?suse_version} == 1315 +# need autoreconf if patch translation has run +%if 0%{?suse_version} == 1315 || !0%{?is_opensuse} autoreconf -f -i %endif %configure\