rpms/konq-plugins/F-9 konq-plugins.spec,1.15,1.16 sources,1.8,1.9

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/konq-plugins/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20875/F-9

Modified Files:
	konq-plugins.spec sources 
Log Message:
sync with devel (4.2.2)



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-9/konq-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- konq-plugins.spec	23 Feb 2009 15:48:32 -0000	1.15
+++ konq-plugins.spec	7 Apr 2009 12:20:20 -0000	1.16
@@ -1,17 +1,18 @@
 # Review Request: http://bugzilla.redhat.com/438126
 
 Name:           konq-plugins
-Version:        4.2.0
-Release:        2%{?dist}
+Version:        4.2.2
+Release:        1%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
 License:        GPLv2+ and LGPLv2+
 URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
-Patch0:         konq-plugins-4.2.0-fsview.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         konq-plugins-4.2.0-fsview.patch
+
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
@@ -19,9 +20,6 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdebase4 >= 4.2
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 %description
 Some additional plugins that interact with konqueror
 * adblock: AdBlock plugin
@@ -85,12 +83,20 @@
 
 
 %post
-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 || :
 
 %postun
-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 || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %files -f %{name}.lang 
@@ -112,7 +118,6 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*
-%{_kde4_docdir}/HTML/en/doc/
 %{_kde4_docdir}/HTML/en/konq-plugins/
 %lang(ca) %{_kde4_docdir}/HTML/ca/konq-plugins/
 %lang(de) %{_kde4_docdir}/HTML/de/konq-plugins/
@@ -126,6 +131,16 @@
 
 
 %changelog
+* Tue Apr  7 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
+- KDE 4.2.2
+
+* Wed Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-4
+- fixup handbook install
+- optimize scriptlets
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
 - update %%description
 - Requires: kdebase4 >= 4.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konq-plugins/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Feb 2009 15:48:32 -0000	1.8
+++ sources	7 Apr 2009 12:20:20 -0000	1.9
@@ -1 +1 @@
-1ee6818891745af896d0d397292f759d  konq-plugins-4.2.0.tar.bz2
+2d101c63aed29e67d19838708e7fc5e4  konq-plugins-4.2.2.tar.bz2