[gimp] don't have duplicate mime types in desktop file

[Nils Philippsen]

commit f498beaea8ef36915298029e3235191621237276
Author: Nils Philippsen <nils at redhat.com>
Date:   Wed Mar 6 15:36:38 2013 +0100

    don't have duplicate mime types in desktop file

 gimp-2.8.4-mime-types.patch |   44 +++++++++++++++++++++++++++++++++++++++++++
 gimp.spec                   |    5 ++++
 2 files changed, 49 insertions(+), 0 deletions(-)
---
diff --git a/gimp-2.8.4-mime-types.patch b/gimp-2.8.4-mime-types.patch
new file mode 100644
index 0000000..09ea278
--- /dev/null
+++ b/gimp-2.8.4-mime-types.patch
@@ -0,0 +1,44 @@
+From 684426ba6a623ee2473c852152dee013652ca49c Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at redhat.com>
+Date: Wed, 6 Mar 2013 15:28:29 +0100
+Subject: [PATCH] patch: mime-types
+
+Squashed commit of the following:
+
+commit 7b32db4ac0653fa375258287843b2dabe57dadfc
+Author: Kevin Cozens <kcozens at svn.gnome.org>
+Date:   Sun Dec 30 10:43:50 2012 -0500
+
+    Fixed MIME_TYPES. Postscript and PDF are compiled conditionally. Fixes #690882.
+    (cherry picked from commit d17622dce6228bebd646ed1eb3063fc952905cfd)
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2e66736..c32eff3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1024,7 +1024,7 @@ AC_SUBST(GIMP_COMMAND)
+ 
+ # The list of MIME types that are supported by plug-ins that are compiled
+ # unconditionally:
+-MIME_TYPES="application/postscript;application/pdf;image/bmp;image/g3fax;image/gif;image/x-fits;image/x-pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/x-gimp-gbr;image/x-gimp-pat;image/x-gimp-gih"
++MIME_TYPES="image/bmp;image/g3fax;image/gif;image/x-fits;image/x-pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/x-gimp-gbr;image/x-gimp-pat;image/x-gimp-gih"
+ 
+ 
+ ###################
+@@ -1201,6 +1201,10 @@ if test "x$with_gs" != xno; then
+   fi
+ fi
+ 
++if test "x$have_gs" = xyes; then
++  MIME_TYPES="$MIME_TYPES;application/postscript"
++fi
++
+ AC_SUBST(FILE_PS)
+ AM_CONDITIONAL(HAVE_GS, test "x$have_gs" = xyes)
+ AC_SUBST(GS_LIBS)
+-- 
+1.8.1.4
+
diff --git a/gimp.spec b/gimp.spec
index 8b010a7..f6d76bd 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -206,6 +206,9 @@ Patch1:         gimp-2.8.2-cm-system-monitor-profile-by-default.patch
 # Don't trip strict overflow warning.
 # Upstream commit bc610c8fbd61e9574a2c378829b6ab91047d61b7.
 Patch2:         gimp-2.8.4-strict-overflow-warning.patch
+# Don't have duplicate mime types in desktop file.
+# Upstream commit 0ed3b482a422ff684c8921b7de9f44ea7b20345c.
+Patch3:         gimp-2.8.4-mime-types.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -293,6 +296,7 @@ EOF
 
 %patch1 -p1 -b .cm-system-monitor-profile-by-default
 %patch2 -p1 -b .strict-overflow-warning
+%patch3 -p1 -b .mime-types
 
 %build
 %if %{with hardening}
@@ -589,6 +593,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Wed Mar 06 2013 Nils Philippsen <nils at redhat.com>
 - get rid of strict overflow warning
+- don't have duplicate mime types in desktop file
 
 * Wed Feb 06 2013 Nils Philippsen <nils at redhat.com> - 2:2.8.4-1
 - version 2.8.4