[choqok] simplify %files, use %_kde4_appsdir macro use %?_isa to tighten subpkg deps

[Rex Dieter]

commit 88084ffd4040a2711aaad92ec99b299e5a9e8afe
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jun 21 08:05:46 2011 -0500

    simplify %files, use %_kde4_appsdir macro
    use %?_isa to tighten subpkg deps

 choqok.spec |   35 +++++++++++++++++------------------
 1 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/choqok.spec b/choqok.spec
index d785944..4870ce7 100644
--- a/choqok.spec
+++ b/choqok.spec
@@ -1,7 +1,7 @@
 Summary: KDE Micro-Blogging Client
 Name: choqok
 Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3
 Group: Applications/Internet
 URL: http://choqok.gnufolks.org/
@@ -9,7 +9,6 @@ Source: http://d10xg45o6p6dbl.cloudfront.net/projects/c/%{name}/%{name}-%{versio
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cmake >= 2.6
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel
 BuildRequires: gettext
@@ -17,7 +16,9 @@ BuildRequires: qoauth-devel
 BuildRequires: qjson-devel
 BuildRequires: webkitpart-devel
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+# for kwallet, among other goodies
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 %description
 A Free/Open Source micro-blogging client for K Desktop Environment.
@@ -28,15 +29,13 @@ Choqok currently supports Twitter.com and Identi.ca services.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-# for kwallet, among other goodies
-Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 %description libs
 %{summary}
 
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}
@@ -86,21 +85,17 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 %{_kde4_libdir}/kde4/choqok_*.so
 %{_kde4_libdir}/kde4/kcm_choqok_*.so
 %{_kde4_libdir}/kde4/konqchoqokplugin.so
-%{_kde4_iconsdir}/hicolor/*/actions/retweet.png
-%{_kde4_iconsdir}/hicolor/*/apps/*.png
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_sharedir}/applications/kde4/choqok.desktop
 %{_kde4_sharedir}/config.kcfg/*.kcfg
 %{_kde4_sharedir}/kde4/services/choqok_*.desktop
-%{_kde4_sharedir}/kde4/apps/choqok
-%{_kde4_sharedir}/kde4/apps/choqok_*/*.rc
+%{_kde4_appsdir}/choqok/
+%{_kde4_appsdir}/choqok_*/
 %{_kde4_sharedir}/kde4/servicetypes/choqok*.desktop
-%{_kde4_sharedir}/kde4/apps/dbus-1/services/org.kde.choqok.service
-%{_kde4_sharedir}/kde4/apps/khtml/kpartplugins/konqchoqok.desktop
-%{_kde4_sharedir}/kde4/apps/khtml/kpartplugins/konqchoqok.rc
-%{_kde4_sharedir}/kde4/apps/kwebkitpart/kpartplugins/konqchoqok.desktop
-%{_kde4_sharedir}/kde4/apps/kwebkitpart/kpartplugins/konqchoqok.rc
-%{_kde4_sharedir}/kde4/services/ServiceMenus/choqok_share.desktop
-%{_kde4_sharedir}/kde4/services/ServiceMenus/choqok_upload.desktop
+%{_kde4_appsdir}/dbus-1/services/org.kde.choqok.service
+%{_kde4_appsdir}/khtml/kpartplugins/konqchoqok.*
+%{_kde4_appsdir}/kwebkitpart/kpartplugins/konqchoqok.*
+%{_kde4_sharedir}/kde4/services/ServiceMenus/choqok_*.desktop
 
 %files libs
 %defattr(-,root,root,-)
@@ -110,9 +105,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 %defattr(-,root,root,-)
 %{_kde4_includedir}/choqok/
 %{_kde4_libdir}/lib*.so
-%{_kde4_sharedir}/kde4/apps/cmake/modules/*.cmake
+%{_kde4_appsdir}/cmake/modules/*.cmake
 
 %changelog
+* Tue Jun 21 2011 Rex Dieter <rdieter at fedoraproject.org> 1.1-2
+- simplify %%files, use %%_kde4_appsdir macro
+- use %%?_isa to tighten subpkg deps
+
 * Sun Apr 03 2011 Sven Lankes <sven at lank.es> - 1.1-1
 - new upstream release