[merkaartor] update icon cache (rhbz #768620)

[Sven Lankes]

commit 54ca35ac8bd8858ec1e03194911f05ed79f2a363
Author: Sven Lankes <sven at lank.es>
Date:   Mon Jun 4 22:34:03 2012 +0200

    update icon cache (rhbz #768620)
    
    - Add Education to Desktop category to make desktop-file-validate happy (rhbz  #768616)

 merkaartor-0.18-desktop.patch |    9 +++++++++
 merkaartor.spec               |   20 +++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/merkaartor-0.18-desktop.patch b/merkaartor-0.18-desktop.patch
new file mode 100644
index 0000000..e0d6af7
--- /dev/null
+++ b/merkaartor-0.18-desktop.patch
@@ -0,0 +1,9 @@
+--- src/merkaartor.desktop.orig	2012-06-04 22:23:46.988175951 +0200
++++ src/merkaartor.desktop	2012-06-04 22:23:55.420229636 +0200
+@@ -9,5 +9,5 @@
+ Exec=merkaartor
+ Terminal=false
+ StartupNotify=false
+-Categories=Geography;Network;Qt;
++Categories=Education;Geography;Network;Qt;
+ 
diff --git a/merkaartor.spec b/merkaartor.spec
index 2774ac4..c9b51c1 100644
--- a/merkaartor.spec
+++ b/merkaartor.spec
@@ -1,12 +1,14 @@
 Name:           merkaartor
 Version:        0.18.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.be
 Source0:        %{name}-0.18.0.tar.bz2
+# http://merkaartor.be/issues/3330
+Patch0:         merkaartor-0.18-desktop.patch
 
 BuildRequires:  qt4-devel >= 4.4, qt4-webkit-devel
 BuildRequires:  desktop-file-utils
@@ -27,6 +29,7 @@ transparent display of map features like roads and curved roads.
 
 %prep
 %setup -q -n %{name}-0.18.0
+%patch0
 
 %build
 # Use packaged qtsingleappicaton instead of bundled version
@@ -45,6 +48,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -63,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Mon Jun 04 2012 Sven Lankes <sven at lank.es> - 0.18.0-3
+- update icon cache (rhbz #768620)
+- Add Education to Desktop category to make desktop-file-validate happy (rhbz  #768616)
+
 * Thu May 31 2012 Sven Lankes <sven at lank.es> - 0.18.0-2
 - new upstream release