rpms/gthumb/devel gthumb.spec,1.41,1.42

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20341

Modified Files:
	gthumb.spec 
Log Message:
fix dependencies



Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gthumb.spec	20 Apr 2006 16:25:55 -0000	1.41
+++ gthumb.spec	20 Apr 2006 16:41:26 -0000	1.42
@@ -20,7 +20,6 @@
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: nautilus >= %{nautilus_version}
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version}
 BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version}
 BuildRequires: libexif-devel
@@ -34,7 +33,12 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 
-Requires: scrollkeeper
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): GConf2
+
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 Patch0: gthumb-2.7.3-use-local-filename.patch
 
@@ -70,17 +74,22 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+scrollkeeper-update -q
+update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gthumb.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gthumb.schemas > /dev/null
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %postun
-scrollkeeper-update
-update-desktop-database %{_datadir}/applications
+scrollkeeper-update -q
+update-desktop-database -q
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -97,6 +106,7 @@
 %{_datadir}/application-registry
 %{_datadir}/man/man*/*
 %{_datadir}/omf
+%{_datadir}/icons/hicolor/*
 
 %changelog
 * Thu Apr 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.6-2