rpms/kmymoney2/F-12 .cvsignore, 1.20, 1.21 kmymoney2.spec, 1.48, 1.49 sources, 1.19, 1.20

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22295

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Wed Jul 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-1
- kmymoney2-1.0.5
- use %find_lang --with-kde



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-12/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	5 Apr 2010 19:33:29 -0000	1.20
+++ .cvsignore	14 Jul 2010 15:13:14 -0000	1.21
@@ -1 +1 @@
-kmymoney2-1.0.4.tar.bz2
+kmymoney2-1.0.5.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-12/kmymoney2.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- kmymoney2.spec	5 Apr 2010 19:33:29 -0000	1.48
+++ kmymoney2.spec	14 Jul 2010 15:13:14 -0000	1.49
@@ -17,7 +17,7 @@ BuildRequires: libutempter-devel
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 1.0.4
+Version: 1.0.5
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -104,29 +104,14 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
-desktop-file-install \
-  --vendor="" --dir=%{buildroot}%{_datadir}/applications/kde/ \
+%if 0%{?rhel}
+desktop-file-install --vendor="" \
+  --dir=%{buildroot}%{_datadir}/applications/kde \
   %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
+%endif
 
-## File lists
 # locale's
-%find_lang %{name}
-# HTML (1.0)
-HTML_DIR=$(kde-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}.lang
-    # replace absolute symlinks with relative ones
-    pushd $lang_dir
-      for i in *; do
-        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
-      done
-    popd
-  fi
-done
-fi
+%find_lang %{name} --with-kde
 
 # Unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
@@ -136,6 +121,7 @@ rm -rf %{buildroot}%{_datadir}/icons/*/s
 %check 
 # Currently broken w/--enable-final: http://bugs.kde.org/115863
 %{?_with_check:make check }
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
 
 
 %post libs -p /sbin/ldconfig
@@ -148,10 +134,8 @@ touch --no-create %{_datadir}/icons/loco
 touch --no-create %{_datadir}/icons/oxygen &> /dev/null || :
 touch --no-create %{_datadir}/icons/Tango &> /dev/null || :
 
-
 %postun
 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
   touch --no-create %{_datadir}/icons/oxygen &> /dev/null
@@ -160,14 +144,15 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
+  update-desktop-database -q &> /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 || :
 gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
+update-desktop-database -q &> /dev/null
 
 
 %files -f %{name}.lang
@@ -211,6 +196,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.5-1
+- kmymoney2-1.0.5
+- use %%find_lang --with-kde
+
 * Wed Mar 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.4-1
 - kmymoney2-1.0.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	5 Apr 2010 19:33:29 -0000	1.19
+++ sources	14 Jul 2010 15:13:14 -0000	1.20
@@ -1 +1 @@
-5971b8b2bc4107b967e267bc635d1b5c  kmymoney2-1.0.4.tar.bz2
+7be750718277ac7c577c574c712f53a2  kmymoney2-1.0.5.tar.bz2