rpms/konq-plugins/devel konq-plugins-4.2.0-fix_docs.patch, NONE, 1.1 konq-plugins.spec, 1.21, 1.22

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31022

Modified Files:
	konq-plugins.spec 
Added Files:
	konq-plugins-4.2.0-fix_docs.patch 
Log Message:
* Wed Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-4
- fixup handbook install
- optimize scriptlets


konq-plugins-4.2.0-fix_docs.patch:

--- NEW FILE konq-plugins-4.2.0-fix_docs.patch ---
diff -up konq-plugins-4.2.0/doc/CMakeLists.txt.fix_docs konq-plugins-4.2.0/doc/CMakeLists.txt
--- konq-plugins-4.2.0/doc/CMakeLists.txt.fix_docs	2009-01-22 10:21:08.000000000 -0600
+++ konq-plugins-4.2.0/doc/CMakeLists.txt	2009-03-25 13:12:01.000000000 -0500
@@ -11,4 +11,4 @@ add_subdirectory(validators)
 add_subdirectory(webarchiver)
 ########### install files ###############
 
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR konq-plugins)


Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- konq-plugins.spec	25 Feb 2009 11:48:00 -0000	1.21
+++ konq-plugins.spec	25 Mar 2009 18:17:47 -0000	1.22
@@ -2,16 +2,18 @@
 
 Name:           konq-plugins
 Version:        4.2.0
-Release:        3%{?dist}
+Release:        4%{?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
+Patch50:        konq-plugins-4.2.0-fix_docs.patch
+
 BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
@@ -19,9 +21,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
@@ -51,6 +50,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fsview
+%patch50 -p1 -b .fix_docs
 
 
 %build
@@ -85,12 +85,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 +120,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 +133,10 @@
 
 
 %changelog
+* 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