Hello community, here is the log from the commit of package gnome-settings-daemon for openSUSE:Factory checked in at 2012-02-29 14:07:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old) and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-settings-daemon", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes 2012-02-16 22:04:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes 2012-02-29 14:07:18.000000000 +0100 @@ -1,0 +2,30 @@ +Thu Feb 23 16:50:13 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.90.1: + + Fix build with --enable-systemd +- Changes from version 3.3.90: + + Build: + - Remove last requirement for dbus-glib + - Remove use of deprecated g_thread_init() + - Fix linking with -Bsymbolic + + Color: + - Set _ICC_PROFILE correctly when there is no primary device + specified + + Keyboard: + - Fix blinking num-lock in some circumstances + + Power: + - Fix possible crasher in backlight helper on error + + Wacom: + - Add tablet button listing and settings + - Add display mapping +- Add pkgconfig(xorg-wacom) and pkgconfig(xtst) BuildRequires: new + dependencies for the wacom plugin. +- Stop using %{_libexecdir}/gnome-settings-daemon-3.0 as + libexecdir: we were only doing this to avoid migration issues + from <= 11.4 (where %{_libexecdir}/gnome-settings-daemon/ was + used as libexecdir). +- Add gnome-settings-daemon-fix-install.patch: fix installation + issue that is exhibited when libdir = libexecdir, where the + gnome-settings-daemon binary would not be where it should. + +------------------------------------------------------------------- Old: ---- gnome-settings-daemon-3.3.5.tar.xz New: ---- gnome-settings-daemon-3.3.90.1.tar.xz gnome-settings-daemon-fix-install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.uC0CGy/_old 2012-02-29 14:07:23.000000000 +0100 +++ /var/tmp/diff_new_pack.uC0CGy/_new 2012-02-29 14:07:23.000000000 +0100 @@ -15,12 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # We cannot enable systemd support right now, as it is exclusive and means we # lose ConsoleKit support (bad for sysvinit) %define with_systemd 0 Name: gnome-settings-daemon -Version: 3.3.5 +Version: 3.3.90.1 Release: 0 Summary: Settings daemon for the GNOME desktop License: GPL-2.0+ @@ -43,6 +44,8 @@ Patch15: gnome-packagekit-BNC383261.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch +# PATCH-FIX-UPSTREAM gnome-settings-daemon-fix-install.patch bgo#670695 vuntz@opensuse.org -- Fix installation issue occuring because of new libgsd +Patch18: gnome-settings-daemon-fix-install.patch BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gnome-common @@ -56,7 +59,7 @@ BuildRequires: pkgconfig(colord) >= 0.1.12 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1 -BuildRequires: pkgconfig(glib-2.0) >= 2.29.14 +BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common %endif @@ -82,6 +85,8 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xorg-wacom) +BuildRequires: pkgconfig(xtst) Requires: gsettings-desktop-schemas # g-s-d uses the pkexec binary Requires: polkit @@ -134,6 +139,7 @@ # PATCH-NEEDS-REBASE #%%patch15 -p0 %patch17 -p1 +%patch18 -p1 %endif %if 0%{?BUILD_FROM_VCS} @@ -143,7 +149,6 @@ %build autoreconf -f -i %configure\ - --libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \ %if %{with_systemd} --enable-systemd \ %endif @@ -181,20 +186,40 @@ %{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service %{_datadir}/gnome-settings-daemon/ %{_datadir}/gnome-settings-daemon-3.0/ -%dir %{_libexecdir}/gnome-settings-daemon-3.0 -%{_libexecdir}/gnome-settings-daemon-3.0/gnome-fallback-mount-helper -%{_libexecdir}/gnome-settings-daemon-3.0/gnome-settings-daemon -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer +%{_libexecdir}/gnome-fallback-mount-helper +%{_libexecdir}/gnome-settings-daemon +%{_libexecdir}/gsd-backlight-helper +%{_libexecdir}/gsd-locate-pointer +%{_libexecdir}/gsd-printer # From patch2 -#%{_libexecdir}/gnome-settings-daemon-3.0/novell-sysconfig-proxy-helper -%if "%{_libdir}" != "%{_libexecdir}" +#%{_libexecdir}/novell-sysconfig-proxy-helper %dir %{_libdir}/gnome-settings-daemon-3.0/ -%endif +%{_libdir}/gnome-settings-daemon-3.0/libgsd.so +# The versioned files will be removed in next upstream version +%{_libdir}/gnome-settings-daemon-3.0/libgsd.so.* %{_libdir}/gnome-settings-daemon-3.0/*.gnome-settings-plugin -%{_libdir}/gnome-settings-daemon-3.0/*.so -%{_sysconfdir}/xdg/autostart/*.desktop +# Explicitly list all the plugins so we know we don't lose any +%{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so +%{_libdir}/gnome-settings-daemon-3.0/liba11y-settings.so +%{_libdir}/gnome-settings-daemon-3.0/libbackground.so +%{_libdir}/gnome-settings-daemon-3.0/libclipboard.so +%{_libdir}/gnome-settings-daemon-3.0/libcolor.so +%{_libdir}/gnome-settings-daemon-3.0/libcursor.so +%{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so +%{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so +%{_libdir}/gnome-settings-daemon-3.0/libkeyboard.so +%{_libdir}/gnome-settings-daemon-3.0/libmedia-keys.so +%{_libdir}/gnome-settings-daemon-3.0/libmouse.so +%{_libdir}/gnome-settings-daemon-3.0/liborientation.so +%{_libdir}/gnome-settings-daemon-3.0/libpower.so +%{_libdir}/gnome-settings-daemon-3.0/libprint-notifications.so +%{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so +%{_libdir}/gnome-settings-daemon-3.0/libsound.so +%{_libdir}/gnome-settings-daemon-3.0/libupdates.so +%{_libdir}/gnome-settings-daemon-3.0/libxrandr.so +%{_libdir}/gnome-settings-daemon-3.0/libxsettings.so +%{_sysconfdir}/xdg/autostart/gnome-fallback-mount-helper.desktop +%{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml @@ -213,7 +238,7 @@ %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml %{_datadir}/icons/hicolor/*/apps/gsd-xrandr.* %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy -%{_mandir}/man1/gnome-settings-daemon.1* +%{_mandir}/man1/gnome-settings-daemon.1%{?ext_man} # Own the directory since we can't depend on gconf providing them %dir %{_datadir}/GConf %dir %{_datadir}/GConf/gsettings ++++++ gnome-settings-daemon-fix-install.patch ++++++

From bbb727712ebbcf677daeac3612dfdf40113476bf Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess@hadess.net> Date: Thu, 23 Feb 2012 17:30:37 +0100 Subject: [PATCH] main: Fix problems when libexecdir == libdir

As done in Debian and OpenSUSE https://bugzilla.gnome.org/show_bug.cgi?id=670695 --- gnome-settings-daemon/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Index: gnome-settings-daemon-3.3.90/gnome-settings-daemon/Makefile.am =================================================================== --- gnome-settings-daemon-3.3.90.orig/gnome-settings-daemon/Makefile.am +++ gnome-settings-daemon-3.3.90/gnome-settings-daemon/Makefile.am @@ -14,7 +14,9 @@ INCLUDES = \ $(SYSTEMD_CFLAGS) \ $(NULL) -pkglib_LTLIBRARIES = \ +privlibdir = $(pkglibdir)-$(GSD_API_VERSION) + +privlib_LTLIBRARIES = \ libgsd.la \ $(NULL) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org