From e9af2cf8eb387befe904fda7f3f1a0966e013984 Mon Sep 17 00:00:00 2001
From: Davide Madrisan <davide.madrisan@gmail.com>
Date: Thu, 29 Dec 2011 14:52:47 +0100
Subject: [PATCH] templates/kde4: minor updates

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
---
 ChangeLog      |  4 ++++
 templates/kde4 | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b81ea2e..88aca0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ Changes in version 1.8.2
   * templates/library - Davide Madrisan:
     Add a missing requirement.
 
++ update
+  * templates/kde4 - Davide Madrisan:
+    Minor updates.
+
 --------------------------------------------------------------------------------
 
 Changes in version 1.8.1 - Christmas Release
diff --git a/templates/kde4 b/templates/kde4
index e7530cb..e1d0411 100644
--- a/templates/kde4
+++ b/templates/kde4
@@ -47,22 +47,24 @@ BuildRoot:     @rpm_default_buildroot@
 /sbin/ldconfig
 @fi:shared_libraries
 @if:icons_mimetypes
+## remove the following line if this package has no hicolor icons
 touch --no-create %{_kde4_icondir}/hicolor &>/dev/null
+## remove the following line if this package has no oxygen icons
 touch --no-create %{_kde4_icondir}/oxygen &>/dev/null
 @fi:icons_mimetypes
 exit 0
 
 @if:icons_mimetypes
 %posttrans
-@fi:icons_mimetypes
 @if:shared_libraries
 ## remove the following line if no dynamic libraries are provided by this package
 /sbin/ldconfig
 @fi:shared_libraries
-@if:icons_mimetypes
 update-desktop-database -q &>/dev/null
 update-mime-database %{_kde4_mimedir} &>/dev/null
+## remove the following line if this package has no hicolor icons
 gtk-update-icon-cache %{_kde4_icondir}/hicolor &>/dev/null
+## remove the following line if this package has no oxygen icons
 gtk-update-icon-cache %{_kde4_icondir}/oxygen &>/dev/null
 exit 0
 @fi:icons_mimetypes
@@ -76,9 +78,11 @@ exit 0
 if [ $1 -eq 0 ]; then
 \   update-desktop-database -q &>/dev/null
 \   update-mime-database %{_kde4_mimedir} &>/dev/null
+## remove the following two lines if this package has no hicolor icons
 \   touch --no-create %{_kde4_icondir}/hicolor &>/dev/null
-\   touch --no-create %{_kde4_icondir}/oxygen &>/dev/null
 \   gtk-update-icon-cache %{_kde4_icondir}/hicolor &>/dev/null
+## remove the following two lines if this package has no oxygen icons
+\   touch --no-create %{_kde4_icondir}/oxygen &>/dev/null
 \   gtk-update-icon-cache %{_kde4_icondir}/oxygen &>/dev/null
 fi
 @fi:icons_mimetypes