rpms/kdenetwork/devel kdenetwork.spec,1.181,1.182

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9902

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



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- kdenetwork.spec	31 Mar 2009 12:28:15 -0000	1.181
+++ kdenetwork.spec	1 Apr 2009 18:48:49 -0000	1.182
@@ -46,9 +46,6 @@
 BuildRequires: libv4l-devel
 # FIXME/TODO: libnxcl-devel
 
-# FIXME/TODO: are there other explicit Requires?
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
@@ -95,9 +92,9 @@
 %patch0 -p1 -b .handle-enc-message
 %patch1 -p1 -b .libv4l
 %patch100 -p0 -b .system-libgadu
+rm -rf kopete/protocols/gadu/libgadu/
 %patch104 -p1 -b .kopete-view-history
 
-rm -rf kopete/protocols/gadu/libgadu/
 
 %build
 mkdir -p %{_target_platform}
@@ -105,7 +102,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -119,14 +116,23 @@
 
 
 %post
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /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}/oxygen &> /dev/null ||:
+update-desktop-database -q &> /dev/null ||:
 
 %postun
-/sbin/ldconfig ||:
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+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
 
@@ -157,10 +163,10 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_libdir}/libqgroupwise.so
 
 %files libs
 %defattr(-,root,root,-)
+%{_kde4_libdir}/libqgroupwise.so
 %{_kde4_libdir}/lib*.so.*
 
 %files devel
@@ -171,6 +177,9 @@
 
 
 %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