From 1703967f68e7b779af74a85e09dc51945efb04fb Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Sep 22 2008 08:07:06 +0000
Subject: don't require desktop-file-utils (#463049, patch by Ville Skyttä)


---

diff --git a/gimp.spec b/gimp.spec
index 8223a2f..779b364 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -51,7 +51,7 @@ Version:        2.4.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 @@ BuildRequires:  lcms-devel
 %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:       gutenprint-plugin
 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 @@ if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
 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 @@ fi
 
 %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 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Sep 22 2008 Nils Philippsen <nils@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@redhat.com> - 2:2.4.7-3
 - don't make pyconsole.py plug-in executable as upstream indicates it shouldn't
   be