diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index cc7eb39..b19f3ca 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 5 14:42:14 UTC 2012 - vuntz@opensuse.org + +- Remove data/gnome-settings-daemon.desktop.in from tarball before + building since we need to generate it with the proper libexec + directory, else gnome-settings-daemon will never start properly. + See bgo#666772. + ------------------------------------------------------------------- Thu Jan 5 08:03:19 UTC 2012 - vuntz@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 1f4709b..4600e8d 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -19,6 +19,7 @@ Name: gnome-settings-daemon Version: 3.3.3.1 Release: 0 +# FIXME: on update to 3.3.4, hack removing .desktop.in in %%setup can be removed Summary: Settings daemon for the GNOME desktop License: GPL-2.0+ Group: System/GUI/GNOME @@ -126,6 +127,8 @@ contact the settings daemon via its DBus interface. %prep %setup -q translation-update-upstream +# Hack, see bgo#666772 +rm data/gnome-settings-daemon.desktop.in %if !0%{?BUILD_FROM_VCS} # Disabled because of the non-rebased patches #gnome-patch-translation-prepare