rpms/gimp/devel gimp.spec,1.161,1.162

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27561

Modified Files:
	gimp.spec 
Log Message:
don't require desktop-file-utils (#463049, patch by Ville Skyttä)



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gimp.spec	17 Sep 2008 13:40:43 -0000	1.161
+++ gimp.spec	22 Sep 2008 08:07:06 -0000	1.162
@@ -51,7 +51,7 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -98,7 +98,6 @@
 %endif
 
 Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       desktop-file-utils >= 0.9
 Requires:       glib2 >= 2.12.3
 Requires:       gtk2 >= 2.10.13
 Requires:       pango >= 1.12.2
@@ -111,8 +110,6 @@
 Requires:       gimp-print-plugin
 %endif
 %endif
-Requires(post): /usr/bin/update-desktop-database
-Requires(postun):   /usr/bin/update-desktop-database
 Requires:       hicolor-icon-theme
 %if %{with xdg_open}
 Requires:       xdg-utils
@@ -309,7 +306,7 @@
 fi
 
 %post
-/usr/bin/update-desktop-database %{_datadir}/applications
+/usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -325,7 +322,7 @@
 
 %postun
 if [ "$1" = "0" ]; then
-    /usr/bin/update-desktop-database %{_datadir}/applications || :
+    /usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
 fi
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -454,6 +451,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 22 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-4
+- don't require desktop-file-utils (#463049, patch by Ville Skyttä)
+
 * Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-3
 - don't make pyconsole.py plug-in executable as upstream indicates it shouldn't
   be