[knights] 2.5.0-2

[Rex Dieter]

commit 1dccba7d0fcc2e013cb046c0e0cfecd2d91ed473
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 3 11:49:16 2012 -0500

    2.5.0-2
    
    - do safer out-of-src-tree build
    - add minimal/versioned kdelibs4 dep
    - drop .desktop permissions hack (rpmlint be darned, it's legit)
    - use %find_lang --with-kde
    - use %_kde4_iconsdir consistently

 knights.spec |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)
---
diff --git a/knights.spec b/knights.spec
index fba16d6..75e4f5d 100644
--- a/knights.spec
+++ b/knights.spec
@@ -1,6 +1,6 @@
 Name:		knights
 Version:	2.5.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A chess board for KDE
 
 Group:		Amusements/Games
@@ -8,12 +8,13 @@ Group:		Amusements/Games
 License: GPLv2 or GPLv3
 URL:		http://kde-apps.org/content/show.php/Knights?content=122046
 Source0:	http://dl.dropbox.com/u/2888238/Knights/%{name}-%{version}.tar.bz2
-BuildRequires:	kdegames-devel
+BuildRequires:	kdegames-devel >= 6:4.9
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 Requires:	gnuchess
 #from the KDE SIG page:
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
 
 
 %description
@@ -28,31 +29,32 @@ checking, themes, and nice animations
 
 
 %build
-%{cmake_kde4} .
-make %{?_smp_mflags}
+mkdir build
+pushd build
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C build
 
 
 %install
-make install DESTDIR=%{buildroot}
+make install/fast DESTDIR=%{buildroot} -C build
 
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
 
-%find_lang %{name}
-
-#fix permissions with the desktop file
-chmod 644 %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+%find_lang %{name} --with-kde
 
 
 #scriplet to update the icon cache
 %post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
 %postun
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 fi
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 #end of scriptlet to update the icon cache
 
 
@@ -62,15 +64,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/%{name}
 %{_datadir}/dbus-1/interfaces/org.kde.Knights.xml
 %{_kde4_appsdir}/%{name}
-%{_kde4_iconsdir}/hicolor/*/apps/%{name}.png
-%{_kde4_docdir}/HTML/*/%{name}
+%{_kde4_iconsdir}/hicolor/*/apps/%{name}.*
 %{_kde4_datadir}/applications/kde4/%{name}.desktop
 %{_kde4_configdir}/%{name}.knsrc
 %{_kde4_configdir}.kcfg/%{name}.kcfg
 
 
-
 %changelog
+* Wed Oct 03 2012 Rex Dieter <rdieter at fedoraproject.org> 2.5.0-2
+- do safer out-of-src-tree build
+- add minimal/versioned kdelibs4 dep
+- drop .desktop permissions hack (rpmlint be darned, it's legit)
+- use %%find_lang --with-kde
+- use %%_kde4_iconsdir consistently
+
 * Thu Aug 30 2012 Julian Aloofi <julian at fedoraproject.org> 2.5.0-1
 - update to latest upstream release
 - remove the patch for building against the new KDEgames API