rpms/skrooge/devel skrooge.spec,1.1,1.2

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/skrooge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15846

Modified Files:
	skrooge.spec 
Log Message:
* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-0.4.beta
- misc cosmetics
- mime scriptlets
- move icons to hicolor
- -libs: drop dup'd docs, add min kdelibs4 dep



Index: skrooge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skrooge/devel/skrooge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- skrooge.spec	18 Sep 2009 08:52:48 -0000	1.1
+++ skrooge.spec	21 Sep 2009 16:41:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           skrooge
 Version:        0.5.1
-Release:        0.3.beta%{?dist}
+Release:        0.4.beta%{?dist}
 Summary:        Personal finances manager
 
 Group:          Applications/Productivity
@@ -16,7 +16,9 @@ BuildRequires:  sqlite-devel
 BuildRequires:  kdelibs4-devel
 BuildRequires:  gettext
 
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
@@ -30,6 +32,7 @@ categorize them, and build reports of th
 Summary:        Skrooge libraries
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       kdelibs4%{?_isa} >= %{kde4_version}
 
 %description libs
 Skrooge libraries
@@ -40,7 +43,7 @@ Skrooge libraries
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} .. -DCMAKE_SKIP_RPATH=on
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -48,8 +51,11 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install -C %{_target_platform} DESTDIR=%{buildroot}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
 
+# hack to support non-oxygen icon users (gnome), drop when/if skrooge
+# ever provides hicolor icons (too).
+mv %{buildroot}%{_kde4_iconsdir}/oxygen %{buildroot}%{_kde4_iconsdir}/hicolor 
 
 ## unpackaged devel files
 rm -f %{buildroot}%{_kde4_libdir}/libskgbasemodeler.so
@@ -78,12 +84,16 @@ touch --no-create %{_datadir}/icons/hico
 
 %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 || :
+   update-desktop-database -q &> /dev/null
+   update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %files 
@@ -92,7 +102,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_bindir}/skrooge
 %{_kde4_datadir}/applications/kde4/skrooge.desktop
 %{_kde4_datadir}/config.kcfg/*.kcfg
-%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/skrooge/css/skrooge_monthly-default.css
 %{_kde4_appsdir}/skrooge/images/*/*
 %{_kde4_appsdir}/skrooge/resources/*
@@ -107,12 +117,17 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files libs
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING README TODO
 %{_kde4_libdir}/kde4/plugins/designer/*.so*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/*.so*
 
 %changelog
+* Mon Sep 21 2009 Rex Dieter <rdieter at fedoraproject.org> 0.5.1-0.4.beta
+- misc cosmetics
+- mime scriptlets
+- move icons to hicolor
+- -libs: drop dup'd docs, add min kdelibs4 dep
+
 * Thu Sep 17 2009 Thomas Janssen <thomasj at fedoraproject.org>  0.5.1-0.3.beta
 - Spec file corrections and Version correction