[gnome-screensaver] no more gconf

Matthias Clasen mclasen at fedoraproject.org
Mon Jan 10 17:42:25 UTC 2011


commit e5c68bf5b087595f087611a1837ff24ea2261587
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Jan 10 12:42:01 2011 -0500

    no more gconf

 gnome-screensaver.spec |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index dd3890f..6778e08 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -31,7 +31,6 @@ BuildRequires: libgnomeui-devel => %{libgnomeui_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: libxml2-devel >= %{libxml2_version}
-BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version}
 BuildRequires: libexif-devel >= %{libexif_version}
@@ -49,9 +48,6 @@ BuildRequires: libXxf86misc-devel
 BuildRequires: libXxf86vm-devel
 BuildRequires: libXtst-devel
 BuildRequires: desktop-file-utils
-Requires(pre): GConf2 >= %{gconf2_version}
-Requires(preun): GConf2 >= %{gconf2_version}
-Requires(post): GConf2 >= %{gconf2_version}
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: system-logos
 # since we use it, and pam spams the log if a module is missing
@@ -97,22 +93,6 @@ desktop-file-install --vendor gnome --delete-original                   \
 # hide xscreensaver from the menus
 install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/preferences-post-merged/gnome-screensaver-hide-xscreensaver.menu
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas >/dev/null
-
-%pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas >/dev/null
-fi
-
-%preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-screensaver.schemas >/dev/null
-fi
-
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS NEWS README COPYING
@@ -127,7 +107,6 @@ fi
 %{_datadir}/desktop-directories/gnome-screensaver.directory
 %dir %{_datadir}/gnome-background-properties
 %{_datadir}/gnome-background-properties/cosmos.xml
-%{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/xdg/menus/preferences-post-merged/*
 %{_sysconfdir}/xdg/menus/gnome-screensavers.menu
 %{_sysconfdir}/pam.d/*


More information about the scm-commits mailing list