rpms/kdepim/F-10 .cvsignore, 1.60, 1.61 kdepim.spec, 1.207, 1.208 sources, 1.69, 1.70

[Rex Dieter]

Author: rdieter

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore	9 Mar 2009 14:36:44 -0000	1.60
+++ .cvsignore	2 Apr 2009 15:10:25 -0000	1.61
@@ -1 +1 @@
-kdepim-4.2.1.tar.bz2
+kdepim-4.2.2.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/kdepim.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- kdepim.spec	9 Mar 2009 14:37:46 -0000	1.207
+++ kdepim.spec	2 Apr 2009 15:10:25 -0000	1.208
@@ -5,17 +5,14 @@
 Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
-Version: 4.2.1
-Release: 3%{?dist}
+Version: 4.2.2
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
-# upstream patches
-Patch100: kdepim-4.2.1-imap.patch
-Patch101: kdepim-4.2.1-korganizer_view.patch 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +20,6 @@
 
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 BuildRequires: akonadi-devel
 BuildRequires: bison flex
 BuildRequires: boost-devel
@@ -95,8 +89,6 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-%patch100 -p0 -b .imap
-%patch101 -p4 -b .korganizer_view
 
 
 %build
@@ -129,15 +121,22 @@
 
 
 %post
-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 || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
-%postun
-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 || :
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
+%postun
+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
 
 %post libs -p /sbin/ldconfig
 
@@ -187,6 +186,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
+
 * Mon Mar 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-3
 - upstream korganizer-view patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-10/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	27 Feb 2009 18:04:36 -0000	1.69
+++ sources	2 Apr 2009 15:10:25 -0000	1.70
@@ -1 +1 @@
-2ebc3730aaee53f494e8e6abd26029bd  kdepim-4.2.1.tar.bz2
+964208d570845c75e0c482bb3d33892f  kdepim-4.2.2.tar.bz2