Author: kiesiu Date: Tue Sep 27 18:35:47 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.2.0; merged from DEVEL
---- Files affected: packages/gnome-settings-daemon: gnome-settings-daemon.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: packages/gnome-settings-daemon/gnome-settings-daemon.spec diff -u packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.41 packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.42 --- packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.41 Thu Aug 25 21:36:31 2011 +++ packages/gnome-settings-daemon/gnome-settings-daemon.spec Tue Sep 27 20:35:42 2011 @@ -4,13 +4,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 @@ -19,19 +19,21 @@ 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 @@ -50,12 +52,13 @@ 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 @@ -70,7 +73,7 @@ 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 @@ -93,7 +96,8 @@ %{__autoconf} %{__automake} %configure \ - --disable-silent-rules + --disable-silent-rules \ + --with-pnpids=%{_datadir}/libgnome-desktop-3.0/pnp.ids %{__make} %install @@ -123,21 +127,26 @@ %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 @@ -147,14 +156,17 @@ %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 @@ -170,10 +182,12 @@ %{_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 @@ -188,11 +202,42 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.42 2011/09/27 18:35:42 kiesiu +- updated to 3.2.0; merged from DEVEL + Revision 1.41 2011/08/25 19:36:31 megabajt - updated to 3.0.3 Revision 1.40 2011/08/19 09:48:05 glen - some todo + +Revision 1.39.2.9 2011/09/25 16:47:19 wiget +- conflicts with older gnome-color-manager +- rel. 2 + +Revision 1.39.2.8 2011/09/25 11:08:26 kiesiu +- use pnp.ids from gnome-desktop + +Revision 1.39.2.7 2011/09/19 16:11:12 megabajt +- updated to 3.1.92 + +Revision 1.39.2.6 2011/09/19 09:16:19 wiget +- remove duplicate BR for nss-devel + +Revision 1.39.2.5 2011/09/18 18:32:48 megabajt +- updated deps + +Revision 1.39.2.4 2011/09/06 14:40:51 wiget +- up to 3.1.91 + +Revision 1.39.2.3 2011/09/05 16:46:41 wiget +- swtich to .xz + +Revision 1.39.2.2 2011/09/01 21:45:41 patrys +- 3.1.90 + +Revision 1.39.2.1 2011/07/31 19:57:30 patrys +- 3.1.4 Revision 1.39 2011/05/23 22:28:27 kiesiu - updated to 3.0.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-settings-daemon/gnome-settings-daemon.spec?r1=1.41&r2=1.42&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
