rpms/kdegraphics/F-10 .cvsignore, 1.54, 1.55 kdegraphics.spec, 1.188, 1.189 sources, 1.63, 1.64

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdegraphics.spec sources 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-2
- optimize scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	5 Mar 2009 02:47:33 -0000	1.54
+++ .cvsignore	1 Apr 2009 23:20:07 -0000	1.55
@@ -1 +1 @@
-kdegraphics-4.2.1.tar.bz2
+kdegraphics-4.2.2.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/kdegraphics.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- kdegraphics.spec	9 Mar 2009 14:34:58 -0000	1.188
+++ kdegraphics.spec	1 Apr 2009 23:20:07 -0000	1.189
@@ -6,8 +6,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.2.1
-Release:        3%{?dist}
+Version:        4.2.2
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -20,7 +20,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
-Patch100: gwenview-fix-version.diff
 
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -49,8 +48,6 @@
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: cups
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 
 Obsoletes: kdegraphics-extras < 7:4.0.0 
 Obsoletes: gwenview < 2
@@ -72,8 +69,6 @@
 %if 0%{?obsolete_kde3_kipi}
 Obsoletes: libkdcraw < 0.2.0, libkexiv2 < 0.4.0, libkipi < 0.2.0
 %endif
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 %description libs
 %{summary}.
 
@@ -97,7 +92,6 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-%patch100 -p1 -b .gwenview_fix_version
 
 
 %build
@@ -127,20 +121,32 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 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 || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 %post libs
 /sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans libs
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %postun libs
 /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
@@ -213,6 +219,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
 - gwenview-fix-version.diff
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-10/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	2 Mar 2009 10:29:25 -0000	1.63
+++ sources	1 Apr 2009 23:20:07 -0000	1.64
@@ -1 +1 @@
-9cc2bc859e678aa6178a5c6cf87eb0ab  kdegraphics-4.2.1.tar.bz2
+92ccbd703885a1f7788e4f27f281a75c  kdegraphics-4.2.2.tar.bz2