rpms/kdeutils/F-9 .cvsignore, 1.55, 1.56 kdeutils.spec, 1.139, 1.140 sources, 1.62, 1.63

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9996

Modified Files:
	.cvsignore kdeutils.spec sources 
Log Message:
4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	5 Mar 2009 11:59:16 -0000	1.55
+++ .cvsignore	2 Apr 2009 15:42:56 -0000	1.56
@@ -1,3 +1,2 @@
-kdeutils-4.2.0.tar.bz2
-kdepim-4.2.0.tar.bz2
-kdepim-4.2.1.tar.bz2
+kdeutils-4.2.2.tar.bz2
+kdepim-4.2.2.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- kdeutils.spec	14 Mar 2009 17:36:27 -0000	1.139
+++ kdeutils.spec	2 Apr 2009 15:42:56 -0000	1.140
@@ -1,12 +1,12 @@
 %if 0%{?fedora} == 9
-# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
+# continue including kjots here (as in 4.0) for F9 (we don't have kdepim4 there)
 %define include_kjots 1
 %endif
 
 Name:           kdeutils
 Epoch:          6
-Version:        4.2.1
-Release:        3%{?dist}.2
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -28,8 +28,8 @@
 BuildRequires:  libzip-devel
 BuildRequires:  qimageblitz-devel
 
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 Requires: kdelibs4 >= %{version}
 
 # printer applet
@@ -120,16 +120,24 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %files
@@ -187,6 +195,12 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3.2
 - also drag in the printer-applet on F9
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	27 Feb 2009 18:53:35 -0000	1.62
+++ sources	2 Apr 2009 15:42:56 -0000	1.63
@@ -1,2 +1,2 @@
-ed3397244a64530c108e76d6767c07d0  kdeutils-4.2.1.tar.bz2
-2ebc3730aaee53f494e8e6abd26029bd  kdepim-4.2.1.tar.bz2
+3df5186f9dacddbce48a1c7eb35515cd  kdeutils-4.2.2.tar.bz2
+964208d570845c75e0c482bb3d33892f  kdepim-4.2.2.tar.bz2