From 5bd56ab6436db5f107cdcc6f7271001581451faf Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Apr 01 2009 23:22:07 +0000
Subject: - optimize scriptlets


---

diff --git a/.cvsignore b/.cvsignore
index 9974338..e80a9b6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kdegraphics-4.2.1.tar.bz2
+kdegraphics-4.2.2.tar.bz2
diff --git a/gwenview-fix-version.diff b/gwenview-fix-version.diff
deleted file mode 100644
index 8dad922..0000000
--- a/gwenview-fix-version.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gwenview/app/main.cpp b/gwenview/app/main.cpp
-index 8bdf041..74dd694 100644
---- a/gwenview/app/main.cpp
-+++ b/gwenview/app/main.cpp
-@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) {
- 		"gwenview",        /* appname */
- 		0,                 /* catalogName */
- 		ki18n("Gwenview"), /* programName */
--		"2.2.0");          /* version */
-+		"2.2.1");          /* version */
- 	aboutData.setShortDescription(ki18n("An Image Viewer"));
- 	aboutData.setLicense(KAboutData::License_GPL);
- 	aboutData.setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien Gâteau"));
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 378c8c1..694f5c1 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -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 @@ Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{ve
 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 @@ BuildRequires:  soprano-devel
 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 @@ Group:   System Environment/Libraries
 %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 @@ Provides:  libkdcraw-devel = 0.4.0-2, libkexiv2-devel = 0.5.0-1, libkipi-devel =
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-%patch100 -p1 -b .gwenview_fix_version
 
 
 %build
@@ -127,20 +121,32 @@ rm -rf %{buildroot}
 
 
 %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 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-2
+- optimize scriptlets
+
+* Tue Mar 31 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
 * Mon Mar 09 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.1-3
 - gwenview-fix-version.diff
 
diff --git a/sources b/sources
index 3944c78..c0292b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cc2bc859e678aa6178a5c6cf87eb0ab  kdegraphics-4.2.1.tar.bz2
+92ccbd703885a1f7788e4f27f281a75c  kdegraphics-4.2.2.tar.bz2