From c4ea79004a67f8519b73bd280bb7d33a9a237908f3754baa522fedc058ff479c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 8 Feb 2012 11:00:24 +0000 Subject: [PATCH] Accepting request 103119 from home:vuntz:branches:GNOME:Factory Update to 3.3.5 OBS-URL: https://build.opensuse.org/request/show/103119 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=124 --- gnome-settings-daemon-3.3.4.tar.xz | 3 -- gnome-settings-daemon-3.3.5.tar.xz | 3 ++ gnome-settings-daemon.changes | 48 ++++++++++++++++++++++++++++++ gnome-settings-daemon.spec | 42 ++++++++++---------------- 4 files changed, 67 insertions(+), 29 deletions(-) delete mode 100644 gnome-settings-daemon-3.3.4.tar.xz create mode 100644 gnome-settings-daemon-3.3.5.tar.xz diff --git a/gnome-settings-daemon-3.3.4.tar.xz b/gnome-settings-daemon-3.3.4.tar.xz deleted file mode 100644 index 27b6d89..0000000 --- a/gnome-settings-daemon-3.3.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbddf248038a231a62907f497e6b484eb020983ef5caf02a152c402092cb5294 -size 1444936 diff --git a/gnome-settings-daemon-3.3.5.tar.xz b/gnome-settings-daemon-3.3.5.tar.xz new file mode 100644 index 0000000..b193012 --- /dev/null +++ b/gnome-settings-daemon-3.3.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a942d5027ebd51859085743d3243fe68b9410bf1eaed8d159a2ecebaaad873e +size 1439648 diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index e35c37d..97b1a25 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Tue Feb 7 19:11:41 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.5: + + Build: + - Remove unused date & time mechanism. gnome-control-center + uses a different API, provided by systemd on some systems. + + A11y keyboard: + - Reduce the number of settings updates on startup + + Automounter: + - Optionally use systemd to check for active seat + + Color: + - Set the brightness of the display if it was saved as + metadata in the color profile + + Keyboard: + - Don't save num-lock state when caps-lock changes + + Media keys: + - Add screenshot keyboard shortcuts + + Power: + - Require a newer upower + - Optionally use systemd to shutdown when power is low + - Use GDBusProxy-compatible PropertiesChanged signal + - Fix "
" appearing in notification popups + + Printers: + - Also notify for unknown error reasons + - Unify printer name usage + + Wacom: + - Add a way to get/set the screen associated with a tablet + - Don't crash when using a generic tablet + - Add support for the puck and touch device types + - Add support for enumerating tablet buttons + + Media keys, XSettings, Updates: + - Fix possible crashes on exit + + Housekeeping, Wacom, XSettings: + - Fix memory leaks +- Remove xz BuildRequires now that it comes for free in the build + system. +- Remove pkgconfig(dbus-glib-1), pkgconfig(polkit-gobject-1) + BuildRequires: not needed anymore. +- Remove polkit-datetime subpackage: this polkit mechanism is gone + upstream. +- Get ready for full-switch to systemd: + + Add a with_systemd macro, currently set to 0 as the systemd + support implies no support for ConsoleKit, which we want to + keep until sysvinit is not supported anymore. + + Add pkgconfig(libsystemd-login) BuildRequires and pass + --enable-systemd to configure if we build systemd support. + ------------------------------------------------------------------- Tue Jan 17 16:09:49 UTC 2012 - vuntz@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 12950db..e41a9e2 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -15,8 +15,12 @@ # 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.4 +Version: 3.3.5 Release: 0 Summary: Settings daemon for the GNOME desktop License: GPL-2.0+ @@ -39,6 +43,7 @@ Patch14: gnome-packagekit-fate302445.patch 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 +BuildRequires: cups-devel BuildRequires: fdupes BuildRequires: gnome-common # Disabled because of the non-rebased patches @@ -46,11 +51,9 @@ BuildRequires: gnome-common BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: cups-devel -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz +# For directory ownership; it's fine to BuildRequire it since it's also a Requires +BuildRequires: polkit BuildRequires: pkgconfig(colord) >= 0.1.12 -BuildRequires: pkgconfig(dbus-glib-1) >= 0.7.4 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gconf-2.0) >= 2.6.1 BuildRequires: pkgconfig(glib-2.0) >= 2.29.14 @@ -68,12 +71,14 @@ BuildRequires: pkgconfig(libgnomekbd) BuildRequires: pkgconfig(libgnomekbdui) BuildRequires: pkgconfig(libnotify) >= 0.7.3 BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(libwacom) >= 0.2 +%if %{with_systemd} +BuildRequires: pkgconfig(libsystemd-login) +%endif +BuildRequires: pkgconfig(libwacom) >= 0.3 BuildRequires: pkgconfig(libxklavier) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(packagekit-glib2) >= 0.6.12 -BuildRequires: pkgconfig(polkit-gobject-1) -BuildRequires: pkgconfig(upower-glib) >= 0.9.1 +BuildRequires: pkgconfig(upower-glib) >= 0.9.11 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) @@ -83,8 +88,6 @@ Requires: polkit Recommends: %{name}-lang # For housekeeping plugin, that uses the nautilus dbus service Recommends: nautilus -# Split so people can depend on this only if needed -Requires: %{name}-polkit-datetime = %{version} Obsoletes: resapplet BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -98,15 +101,6 @@ the startup of the screensaver, etc. This module was previously part of GNOME Control Center, but has been splitted from it for a more general use. -%package polkit-datetime -Summary: PolicyKit helper to set the system date and time -Group: System/GUI/GNOME -Requires: timezone - -%description polkit-datetime -This package contains a PolicyKit helper to set the system date and -time. - %package devel Summary: Development package for the GNOME settings daemon Group: System/GUI/GNOME @@ -150,6 +144,9 @@ NOCONFIGURE=1 /usr/bin/gnome-autogen.sh autoreconf -f -i %configure\ --libexecdir=%{_libexecdir}/gnome-settings-daemon-3.0 \ +%if %{with_systemd} + --enable-systemd \ +%endif --enable-gconf-bridge \ --disable-static \ --with-pnpids=%{_datadir}/libgnome-desktop-3.0/pnp.ids @@ -223,13 +220,6 @@ rm -rf %{buildroot} %{_datadir}/GConf/gsettings/gnome-settings-daemon.convert %{_mandir}/man1/* -%files polkit-datetime -%defattr(-,root,root) -%{_libexecdir}/gnome-settings-daemon-3.0/gsd-datetime-mechanism -%{_datadir}/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service -%{_datadir}/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy -%{_sysconfdir}/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf - %files lang -f %{name}.lang %files devel