rpms/kdesdk/F-10 .cvsignore, 1.53, 1.54 kdesdk.spec, 1.127, 1.128 sources, 1.56, 1.57

[Rex Dieter]

Author: rdieter

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	27 Feb 2009 19:07:45 -0000	1.53
+++ .cvsignore	2 Apr 2009 15:21:48 -0000	1.54
@@ -1,6 +1 @@
-kdesdk-4.1.2.tar.bz2
-kdesdk-4.1.80.tar.bz2
-kdesdk-4.1.85.tar.bz2
-kdesdk-4.1.96.tar.bz2
-kdesdk-4.2.0.tar.bz2
-kdesdk-4.2.1.tar.bz2
+kdesdk-4.2.2.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- kdesdk.spec	27 Feb 2009 19:07:45 -0000	1.127
+++ kdesdk.spec	2 Apr 2009 15:21:48 -0000	1.128
@@ -1,6 +1,6 @@
 Name:           kdesdk
-Version:        4.2.1
-Release:        1%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -29,8 +29,6 @@
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -121,15 +119,29 @@
 %clean
 rm -rf %{buildroot}
 
+
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
+
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/locolor &> /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}/locolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -214,6 +226,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
+
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
 - blockquote patch (#487624)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	27 Feb 2009 18:38:57 -0000	1.56
+++ sources	2 Apr 2009 15:21:48 -0000	1.57
@@ -1 +1 @@
-e1c95a5ab0e34d2d084677199af0b093  kdesdk-4.2.1.tar.bz2
+018767d862229899f4a648a6c36fd0f6  kdesdk-4.2.2.tar.bz2