diff --git a/notification-daemon.spec b/notification-daemon.spec index a574f5b..e59d32a 100644 --- a/notification-daemon.spec +++ b/notification-daemon.spec @@ -1,12 +1,12 @@ %define gtk2_version 2.4.0 %define dbus_version 0.90 %define dbus_glib_version 0.70 -%define gconf_version 2.14 +%define gconf_version 2.14 Summary: Notification Daemon Name: notification-daemon Version: 0.3.5 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.galago-project.org/specs/notification/ License: GPL Group: System Environment/Libraries @@ -23,8 +23,9 @@ BuildRequires: libwnck-devel BuildRequires: libtool BuildRequires: intltool -Requires(post): GConf2 -Requires(preun): GConf2 +Requires(preun): GConf2 >= %{gconf_version} +Requires(pre): GConf2 >= %{gconf_version} +Requires(post): GConf2 >= %{gconf_version} Obsoletes: notify-daemon @@ -56,8 +57,15 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/notification-daemon-1.0/engines/*.*a %clean rm -rf %{buildroot} +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/notification-daemon.schemas >/dev/null || : +fi + %preun -if [ "$1" -gt 0 ]; then +if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/notification-daemon.schemas >/dev/null || : @@ -80,6 +88,9 @@ gconftool-2 --makefile-install-rule \ %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas %changelog +* Wed Oct 18 2006 Matthias Clasen - 0.3.5-8 +- Fix scripts according to packaging guidelines + * Tue Oct 17 2006 Matthias Clasen - 0.3.5-7 - Tighten up Requires (#203813)