rpms/kdebase3/devel kdebase3.spec,1.79,1.80

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase3.spec 
Log Message:
* Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-9
- include drkonqi crash handler
- optimize scriptlets



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdebase3.spec	25 Feb 2009 10:40:12 -0000	1.79
+++ kdebase3.spec	26 Mar 2009 20:16:45 -0000	1.80
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -358,7 +358,7 @@
 export DO_NOT_COMPILE="kappfinder kdesktop kdesu klipper kdm kmenuedit kpager kpersonalizer ktip nsplugins"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE konqueror kscreensaver ksysguard knetattach kwin"
 export DO_NOT_COMPILE="$DO_NOT_COMPILE kdialog kicker ksplashml khelpcenter kxkb"
-export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi"
+export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass"
 # Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves
 # kate for kscope
 # export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave kate"
@@ -603,14 +603,18 @@
 %post
 %{!?libs:/sbin/ldconfig}
 touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
-%{_bindir}/update-desktop-database 2> /dev/null || : 
+
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg  2> /dev/null || :
+update-desktop-database 2> /dev/null || :
 
 %postun
 %{!?libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg  2> /dev/null || :
-%{_bindir}/update-desktop-database 2> /dev/null || : 
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
+  gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg  &> /dev/null || :
+  update-desktop-database &> /dev/null || : 
+fi
 
 %if 0%{?libs}
 %post libs -p /sbin/ldconfig
@@ -620,18 +624,22 @@
 
 %if 0%{?extras}
 %post extras
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+
+%posttrans extras
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg &> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null ||:
+update-desktop-database &> /dev/null || :
 
 %postun extras
-for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null ||:
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg &> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null ||:
+  update-desktop-database &> /dev/null || :
+fi
 %endif
 
 %if 0%{?extras}
@@ -771,7 +779,6 @@
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
 %{_bindir}/appletproxy
-%{_bindir}/drkonqi
 %{_bindir}/extensionproxy
 %{_bindir}/kasbar
 %{_bindir}/kcheckpass
@@ -799,6 +806,7 @@
 %ghost %{_localstatedir}/lib/kdm/kdmsts
 %endif
 %{_datadir}/config.kcfg/*
+%{_bindir}/drkonqi
 %{_bindir}/kde3
 %{_bindir}/kio_media_mounthelper
 %{_bindir}/kio_system_documenthelper
@@ -809,7 +817,7 @@
 %{_bindir}/kprinter
 %{_datadir}/applications/*/*
 %{_datadir}/apps/*
-%{_datadir}/icons/*color/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/mimelnk/*/*
 %{_datadir}/services/*
@@ -868,6 +876,10 @@
 
 
 %changelog
+* Thu Mar 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-9
+- include drkonqi crash handler
+- optimize scriptlets
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.10-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild