[kcoloredit] cleanup spec, fix scriptlets

[Rex Dieter]

commit 148618bc55863682176498685f48153ccf609739
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jul 10 13:35:15 2012 -0500

    cleanup spec, fix scriptlets

 kcoloredit.spec |   82 ++++++++++++++++++++++++-------------------------------
 1 files changed, 36 insertions(+), 46 deletions(-)
---
diff --git a/kcoloredit.spec b/kcoloredit.spec
index 2b883d5..22137f7 100644
--- a/kcoloredit.spec
+++ b/kcoloredit.spec
@@ -1,42 +1,36 @@
-# Review Request:
-# https://bugzilla.redhat.com/show_bug.cgi?id=432137
 
 %define iversion 2.0.0
 
-Name:           kcoloredit
-Version:        4.4.0
-Release:        4%{?dist}
-Summary:        A color palette Editor
+Name:    kcoloredit
+Version: 4.4.0
+Release: 5%{?dist}
+Summary: A color palette Editor
 
-Group:          Applications/Publishing
-License:        GPLv2+
-URL:            http://www.kde.org
-Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/kcoloredit-%{iversion}-kde%{version}.tar.bz2
+License: GPLv2+
+URL:     http://www.kde.org/
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/kcoloredit-%{iversion}-kde%{version}.tar.bz2
+
+## upstream patches
 # fix FTBFS with the new stricter ld in F13 (#564815): explicitly link libX11
-Patch0:         kcoloredit-2.0.0-kde4.4.0-ftbfs.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch100: kcoloredit-2.0.0-kde4.4.0-ftbfs.patch
 
-BuildRequires:  kde-filesystem >= 4
-BuildRequires:  kdelibs4-devel >= 4
+BuildRequires:  kdelibs4-devel 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  cmake
 
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdelibs4 >= %{version}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
 
 %description
 KColorEdit is a palette files editor. It can be used for editing 
 color palettes and for color choosing and naming.
 
+
 %prep
 %setup -qn kcoloredit-%{iversion}-kde%{version}
-%patch0 -p1 -b .ftbfs
+%patch100 -p1 -b .ftbfs
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -47,45 +41,41 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
-
-# validate desktop file
-desktop-file-install --vendor "" \
-    --dir %{buildroot}%{_datadir}/applications/kde4 \
-    %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop 
-
-
-%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
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+%find_lang %{name} --with-kde
+
+
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kcoloredit.desktop
 
-%clean
-rm -rf %{buildroot}
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_kde4_bindir}/kcoloredit
 %{_kde4_appsdir}/kcoloredit/
 %{_kde4_datadir}/applications/kde4/kcoloredit.desktop
-%{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
+%{_kde4_iconsdir}/hicolor/*/*/kcoloredit.*
+
 
 %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