diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index e599db3..eece92f 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,12 +1,16 @@ Name: gnome-settings-daemon Version: 2.29.91.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons License: GPLv2+ URL: http://download.gnome.org/sources/%{name} Source0: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2 +# https://bugzilla.gnome.org/show_bug.cgi?id=611348 +Source1: touchpad-enabled.svg +Source2: touchpad-disabled.svg + Requires(pre): GConf2 >= 2.14 Requires(preun): GConf2 >= 2.14 @@ -57,6 +61,9 @@ developing applications that use %{name}. %patch3 -p1 -b .slight-hinting %patch4 -p1 -b .keyboard-icon +cp %{SOURCE1} plugins/media-keys +cp %{SOURCE2} plugins/media-keys + %build # https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking export LIBS="-lX11 -lm" @@ -97,10 +104,7 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/gnome-settings-daemon.schemas \ %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas \ >& /dev/null || : -touch %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor -fi +touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : %pre if [ "$1" -gt 1 ]; then @@ -145,11 +149,14 @@ if [ "$1" -eq 0 ]; then fi %postun -touch %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +if [ $1 -eq 0 ]; then + touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : + gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : fi +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS @@ -170,6 +177,10 @@ fi %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Sat Feb 27 2010 Matthias Clasen 2.29.91.1-2 +- Fix Fn-F8 OSD icon +- Modernize scriptlets + * Wed Feb 24 2010 Matthias Clasen 2.29.91.1-1 - Update to 2.29.91.1 diff --git a/touchpad-disabled.svg b/touchpad-disabled.svg new file mode 100644 index 0000000..7a6916c --- /dev/null +++ b/touchpad-disabled.svg @@ -0,0 +1,833 @@ + + + + + Touchpad + + + + image/svg+xml + + Touchpad + + + Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/touchpad-enabled.svg b/touchpad-enabled.svg new file mode 100644 index 0000000..d53b82e --- /dev/null +++ b/touchpad-enabled.svg @@ -0,0 +1,747 @@ + + + + + Touchpad + + + + image/svg+xml + + Touchpad + + + Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +