From 796daa7875c6736f855a46167d486a85d4507327 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 18 Oct 2006 16:48:17 +0000 Subject: [PATCH] fix scripts --- eog.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/eog.spec b/eog.spec index 10c55f0..15a0c14 100644 --- a/eog.spec +++ b/eog.spec @@ -13,7 +13,7 @@ Summary: Eye of GNOME image viewer Name: eog Version: 2.16.0.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 License: GPL @@ -41,7 +41,7 @@ BuildRequires: libXt-devel Requires(post): desktop-file-utils >= %{desktop_file_utils_version} Requires(post): scrollkeeper Requires(post): GConf2 - +Requires(pre): GConf2 Requires(preun): GConf2 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} @@ -81,13 +81,18 @@ rm -rf $RPM_BUILD_ROOT update-desktop-database -q scrollkeeper-update -q export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/eog.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/eog.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/eog.schemas > /dev/null || : + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null || : fi %postun @@ -106,6 +111,9 @@ scrollkeeper-update -q %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Wed Oct 18 2006 Matthias Clasen - 2.16.0.1-3 +- Fix scripts according to the packaging guidelines + * Thu Sep 7 2006 Matthias Clasen - 2.16.0.1-2.fc6 - Fix some directory ownership issues