rpms/kmymoney2/devel kmymoney2.spec,1.38,1.39

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Fri Jul 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.3-3
- validate .desktop file
- -libs unconditional
- use %_isa where appropriate
- optimize scriptlets



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- kmymoney2.spec	25 Feb 2009 11:38:32 -0000	1.38
+++ kmymoney2.spec	17 Jul 2009 13:36:58 -0000	1.39
@@ -8,9 +8,6 @@
 %define ofx_deps libofx-devel opensp-devel libxml++-devel
 %endif
 
-# make -libs subpkg
-%define libs 1
-
 %if 0%{?fedora} > 6
 %define kdelibs3 kdelibs3
 %else
@@ -21,7 +18,7 @@ BuildRequires: libutempter-devel
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.9.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
@@ -33,17 +30,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Obsoletes: kmymoney < %{version}-%{release}
 Provides:  kmymoney = %{version}-%{release}
 
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides:  %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %{?_enable_kbanking:BuildRequires: kbanking-devel qbanking-devel}
 BuildRequires: curl-devel
+buildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: ghostscript
 BuildRequires: %{kdelibs3}-devel
@@ -68,7 +59,7 @@ Summary: Development files for %{name}
 Group:   Development/Libraries
 Obsoletes: kmymoney-devel < %{version}-%{release}
 Provides:  kmymoney-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
@@ -121,32 +112,35 @@ fi
 rm -f %{buildroot}%{_libdir}/lib*.la
 
 
-# Currently broken w/--enable-final: http://bugs.kde.org/115863
 %check 
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
+# Currently broken w/--enable-final: http://bugs.kde.org/115863
 %{?_with_check:make check }
 
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 %post
-%{!?libs:/sbin/ldconfig}
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
 
 %postun
-%{!?libs:/sbin/ldconfig}
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null 
+  touch --no-create %{_datadir}/icons/locolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /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/locolor &> /dev/null || :
+
 
 
 %files -f %{name}.lang
@@ -154,26 +148,24 @@ update-desktop-database %{_datadir}/appl
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2/
-%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applications/kde/kmymoney2.desktop
 %{_datadir}/config.kcfg/kmymoney2.kcfg
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
-%if "%{?_enable_ofxbanking:1}" == "1"
+%if 0%{?_enable_ofxbanking:1}
 %{_datadir}/apps/kmm_ofximport/
 %{_libdir}/kde3/kmm_ofximport.*
 %endif
-%if "%{?_enable_kbanking:1}" == "1"
+%if 0%{?_enable_kbanking:1}
 %{_libdir}/kde3/kmm_kbanking.*
 %{_datadir}/apps/kmm_kbanking/
 %endif
 %{_mandir}/man?/*
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -187,6 +179,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.3-3
+- validate .desktop file
+- -libs unconditional
+- use %%_isa where appropriate
+- optimize scriptlets
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild