- updated to 3.2.0; merged from DEVEL

Changed files:
    gnome-settings-daemon.spec -> 1.42

diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index b67e37dcb9efaed48d80097e7412008c6e1e2ae5..1e0eb7729beb67bcedb24f1fa6abba8b3f12f927 100644 (file)
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -3,13 +3,13 @@
 Summary:       GNOME Settings Daemon
 Summary(pl.UTF-8):     Demon ustawień GNOME
 Name:          gnome-settings-daemon
-Version:       3.0.3
+Version:       3.2.0
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.0/%{name}-%{version}.tar.xz
-# Source0-md5: f80d20d0ecd8675ad413166688deca31
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/3.2/%{name}-%{version}.tar.xz
+# Source0-md5: 418c880430529c91e0503c22c8db8774
 Patch0:                %{name}-pa-reconnect.patch
 # PLD-specific patches
 Patch100:      use-etc-sysconfig-timezone.patch
@@ -18,19 +18,21 @@ BuildRequires:      GConf2-devel >= 2.24.0
 BuildRequires: PackageKit-devel >= 0.6.13
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.9
+BuildRequires: colord-devel >= 0.1.12
 BuildRequires: cups-devel
 BuildRequires: dbus-devel >= 1.2.0
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: fontconfig-devel
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.26.0
-BuildRequires: gnome-desktop-devel >= 2.91.93
-BuildRequires: gsettings-desktop-schemas-devel >= 2.91.92
+BuildRequires: glib2-devel >= 1:2.29.14
+BuildRequires: gnome-desktop-devel >= 3.1.5
+BuildRequires: gsettings-desktop-schemas-devel >= 3.1.91
 BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: intltool >= 0.40.0
+BuildRequires: lcms2-devel >= 2.2
 BuildRequires: libcanberra-gtk3-devel
-BuildRequires: libgnomekbd-devel >= 2.91.5
-BuildRequires: libnotify-devel >= 0.6.1
+BuildRequires: libgnomekbd-devel >= 3.0.0
+BuildRequires: libnotify-devel >= 0.7.3
 BuildRequires: libtool
 BuildRequires: libxklavier-devel >= 5.0
 BuildRequires: nss-devel >= 3.11.2
@@ -49,12 +51,13 @@ BuildRequires:      xorg-lib-libXxf86misc-devel
 BuildRequires: xorg-proto-kbproto-devel
 BuildRequires: xz
 Requires(post,postun): glib2 >= 1:2.26.0
-Requires:      gnome-desktop >= 2.91.93
-Requires:      gsettings-desktop-schemas >= 2.91.92
+Requires:      gnome-desktop >= 3.1.5
+Requires:      gsettings-desktop-schemas >= 3.1.91
 Requires:      gtk-update-icon-cache
 Requires:      hicolor-icon-theme
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
+Conflicts:     gnome-color-manager < 3.1.92-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -69,7 +72,7 @@ Summary(pl.UTF-8):    Plik nagłówkowy do tworzenia klientów demona ustawień GNO
 Group:         Development/Libraries
 Requires:      dbus-devel >= 1.2.0
 Requires:      dbus-glib-devel >= 0.74
-Requires:      glib2-devel >= 1:2.26.0
+Requires:      glib2-devel >= 1:2.29.14
 # doesn't require base currently
 
 %description devel
@@ -92,7 +95,8 @@ Plik nagłówkowy do tworzenia klientów demona ustawień GNOME.
 %{__autoconf}
 %{__automake}
 %configure \
-       --disable-silent-rules
+       --disable-silent-rules \
+       --with-pnpids=%{_datadir}/libgnome-desktop-3.0/pnp.ids
 %{__make}
 
 %install
@@ -122,21 +126,26 @@ fi
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%attr(755,root,root) %{_libexecdir}/gnome-fallback-mount-helper
 %attr(755,root,root) %{_libexecdir}/gnome-settings-daemon
+%attr(755,root,root) %{_libexecdir}/gsd-backlight-helper
 %attr(755,root,root) %{_libexecdir}/gsd-locate-pointer
 %attr(755,root,root) %{_libexecdir}/gsd-datetime-mechanism
 %attr(755,root,root) %{_libexecdir}/gsd-printer
 %dir %{_libdir}/gnome-settings-daemon-3.0
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liba11y-keyboard.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liba11y-settings.so
-%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libautomount.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libbackground.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libclipboard.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libcolor.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libcursor.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libkeybindings.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libkeyboard.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libmedia-keys.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libmouse.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/liborientation.so
+%attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libpower.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libprint-notifications.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libsmartcard.so
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libsound.so
@@ -146,14 +155,17 @@ fi
 %attr(755,root,root) %{_libdir}/gnome-settings-daemon-3.0/libxsettings.so
 %{_libdir}/gnome-settings-daemon-3.0/a11y-keyboard.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/a11y-settings.gnome-settings-plugin
-%{_libdir}/gnome-settings-daemon-3.0/automount.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/background.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/keybindings.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/orientation.gnome-settings-plugin
+%{_libdir}/gnome-settings-daemon-3.0/power.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
@@ -169,10 +181,12 @@ fi
 %{_datadir}/gnome-settings-daemon
 %{_datadir}/gnome-settings-daemon-3.0
 %{_datadir}/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
+%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
 %{_iconsdir}/hicolor/*/*/*.png
 %{_iconsdir}/hicolor/*/*/*.svg
 %{_mandir}/man1/gnome-settings-daemon.1*
-%{_sysconfdir}/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
+/etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
+%{_sysconfdir}/xdg/autostart/gnome-fallback-mount-helper.desktop
 %{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
 
 %files devel