rpms/kdetoys/F-10 .cvsignore, 1.29, 1.30 kdetoys.spec, 1.39, 1.40 sources, 1.29, 1.30

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdetoys/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4102/F-10

Modified Files:
	.cvsignore kdetoys.spec sources 
Log Message:
sync w/devel for 4.2.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	24 Jan 2009 14:49:01 -0000	1.29
+++ .cvsignore	2 Apr 2009 15:24:30 -0000	1.30
@@ -1,5 +1 @@
-kdetoys-4.1.2.tar.bz2
-kdetoys-4.1.80.tar.bz2
-kdetoys-4.1.85.tar.bz2
-kdetoys-4.1.96.tar.bz2
-kdetoys-4.2.0.tar.bz2
+kdetoys-4.2.2.tar.bz2


Index: kdetoys.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/kdetoys.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdetoys.spec	27 Feb 2009 18:45:03 -0000	1.39
+++ kdetoys.spec	2 Apr 2009 15:24:30 -0000	1.40
@@ -1,8 +1,8 @@
 Name:           kdetoys
 Summary:        K Desktop Environment - Toys and Amusements
 Epoch:          7
-Version:        4.2.1
-Release:        1%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 
 License:        GPLv2
 Group:          Amusements/Graphics
@@ -18,8 +18,8 @@
 
 Requires: kdelibs4 >= %{version}
 #Requires: kdebase-workspace
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 
 # FIXME: Don't list / drop kweather? It isn't really working as far as I can
@@ -60,11 +60,17 @@
 
 %post
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %files
@@ -83,7 +89,13 @@
 
 
 %changelog
-* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* 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
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7:4.2.0-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdetoys/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	27 Feb 2009 18:45:03 -0000	1.29
+++ sources	2 Apr 2009 15:24:30 -0000	1.30
@@ -1 +1 @@
-78cd751eb92ec2f068c8dc39794175e6  kdetoys-4.2.1.tar.bz2
+dcc17b3d719c7ddb48f75b64f34af261  kdetoys-4.2.2.tar.bz2