rpms/eog/FC-6 eog.spec,1.60,1.61
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Oct 18 16:49:19 UTC 2006
Author: mclasen
Update of /cvs/dist/rpms/eog/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24924
Modified Files:
eog.spec
Log Message:
fix scripts
Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/FC-6/eog.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- eog.spec 8 Sep 2006 03:46:54 -0000 1.60
+++ eog.spec 18 Oct 2006 16:49:17 -0000 1.61
@@ -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 @@
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 @@
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 @@
%{_sysconfdir}/gconf/schemas/*.schemas
%changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0.1-3
+- Fix scripts according to the packaging guidelines
+
* Thu Sep 7 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0.1-2.fc6
- Fix some directory ownership issues
More information about the fedora-cvs-commits
mailing list