[rawtherapee/f15] Fix MIME directive and changelog

[Thibault North]

commit daf1401f0e7295017ce3769613de75b211c44883
Author: Thibault North <tnorth at fedoraproject.org>
Date:   Sun Feb 12 14:51:08 2012 -0500

    Fix MIME directive and changelog

 rawtherapee.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/rawtherapee.spec b/rawtherapee.spec
index 54afb07..b2344bc 100644
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@ -16,7 +16,7 @@
 
 Name:           rawtherapee
 Version:        4.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -46,6 +46,9 @@ to some common image format.
 # fix wrong line endings
 sed -i "s|\r||g" AUTHORS.txt COMPILE.txt
 
+# Fix faulty MIME directive
+sed -i "s|rawtherapee\.png|rawtherapee|" rtdata/icons/rawtherapee.desktop.in
+
 # Do not install useless rtstart:
 sed -i "s|install (PROGRAMS rtstart|\#install (PROGRAMS rtstart|" CMakeLists.txt
 
@@ -73,7 +76,7 @@ make VERBOSE=1 %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
-desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
@@ -89,12 +92,11 @@ touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi 
-%{_bindir}/update-desktop-database %{_datadir}/applications || :
-
+/usr/bin/update-desktop-database &> /dev/null || :
 /sbin/ldconfig
 
 %postun
-%{_bindir}/update-desktop-database %{_datadir}/applications
+/usr/bin/update-desktop-database &> /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
@@ -112,7 +114,10 @@ fi || :
 %{_datadir}/icons/hicolor/*/apps/rawtherapee.png
 
 %changelog
-* Sat Feb 1 2012  Thibault North <tnorth at fedoraproject.org> - 4.0.7-1
+* Sun Feb 12 2012  Thibault North <tnorth at fedoraproject.org> - 4.0.7-2
+- Fix faulty MIME directive
+
+* Sat Feb 11 2012  Thibault North <tnorth at fedoraproject.org> - 4.0.7-1
 - Update to 4.0.7
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.5-3