[kiconedit] cleanup .spec, fix scriptlets

[Rex Dieter]

commit bfa8d74170521077caf46506ca66e5de370c6638
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jul 10 13:38:26 2012 -0500

    cleanup .spec, fix scriptlets

 kiconedit.spec |   58 +++++++++++++++++++------------------------------------
 1 files changed, 20 insertions(+), 38 deletions(-)
---
diff --git a/kiconedit.spec b/kiconedit.spec
index efd2a16..3e67e7d 100644
--- a/kiconedit.spec
+++ b/kiconedit.spec
@@ -1,23 +1,18 @@
-# Review Request: http://bugzilla.redhat.com/432139
 
-Name:           kiconedit
-Version:        4.4.0
-Release:        4%{?dist}
-Summary:        An icon editor
+Name:    kiconedit
+Version: 4.4.0
+Release: 5%{?dist}
+Summary: An icon editor
 
-Group:          Applications/Publishing
-License:        GPLv2+
-URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+License: GPLv2+
+URL:     http://www.kde.org/
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/%{name}-%{version}.tar.bz2
 
-BuildRequires:  kdelibs4-devel >= 4
-BuildRequires:  cmake
-BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
+BuildRequires: kdelibs4-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
 
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
 
 %description
 KIconEdit is designed to help create icons for 
@@ -42,47 +37,31 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot}
-
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name}
-HTML_DIR=$(kde4-config --expandvars --install html)
-if [ -d %{buildroot}${HTML_DIR} ]; then
-for lang_dir in %{buildroot}${HTML_DIR}/* ; do
-  if [ -d ${lang_dir} ]; then
-    lang=$(basename ${lang_dir})
-    echo "%lang(${lang}) ${HTML_DIR}/${lang}/%{name}/" >> %{name}.lang
-  fi
-done
-fi
+%find_lang %{name} --with-kde
 
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-  update-desktop-database -q &> /dev/null
-  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null
+update-desktop-database -q &> /dev/null ||:
 fi
 
 %posttrans
-update-desktop-database -q &> /dev/null
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null
+update-desktop-database -q &> /dev/null ||:
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.DOC NEWS
 %{_kde4_bindir}/kiconedit
 %{_kde4_appsdir}/kiconedit/
@@ -91,6 +70,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Tue Jul 10 2012 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-5
+- cleanup .spec, fix scriptlets
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild