rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.15, 1.16
Bastien Nocera (hadess)
fedora-extras-commits at redhat.com
Wed Mar 26 11:23:18 UTC 2008
Author: hadess
Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6661
Modified Files:
gnome-settings-daemon.spec
Log Message:
* Wed Mar 26 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.0-3
- apps_gnome_settings_daemon_default_editor.schemas is obsolete (#438937)
Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-settings-daemon.spec 21 Mar 2008 02:39:58 -0000 1.15
+++ gnome-settings-daemon.spec 26 Mar 2008 11:22:44 -0000 1.16
@@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@@ -82,7 +82,6 @@
%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
@@ -92,8 +91,12 @@
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ if [ -f %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas ] ; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
+ >& /dev/null || :
+ fi
gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
@@ -104,8 +107,12 @@
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ if [ -f %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas ] ; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
+ >& /dev/null || :
+ fi
gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas \
%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas \
%{_sysconfdir}/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas \
%{_sysconfdir}/gconf/schemas/desktop_gnome_font_rendering.schemas \
@@ -128,6 +135,9 @@
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
+* Wed Mar 26 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.0-3
+- apps_gnome_settings_daemon_default_editor.schemas is obsolete (#438937)
+
* Thu Mar 20 2008 Matthias Clasen <mclasen at redhat.com> 2.22.0-2
- Fix interaction between "Locate Pointer" and volume keys
More information about the fedora-extras-commits
mailing list