rpms/kdebase/F-9 kdebase-nsplugins-paths.patch, NONE, 1.1 kdebase.spec, 1.326, 1.327

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2660

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-nsplugins-paths.patch 
Log Message:
#426108: Add more directories to konqueror's default plugin search path list


kdebase-nsplugins-paths.patch:

--- NEW FILE kdebase-nsplugins-paths.patch ---
Index: apps/konqueror/settings/konqhtml/pluginopts.cpp
===================================================================
--- apps/konqueror/settings/konqhtml/pluginopts.cpp	(revision 823888)
+++ apps/konqueror/settings/konqhtml/pluginopts.cpp	(working copy)
@@ -432,6 +432,8 @@
         paths.append("/usr/lib/mozilla/plugins");
 	paths.append("/usr/lib64/netscape/plugins");
 	paths.append("/usr/lib64/mozilla/plugins");
+	paths.append("/usr/lib64/mozilla/plugins-wrapped");
+	paths.append("/usr/lib/mozilla/plugins-wrapped");
         paths.append("$MOZILLA_HOME/plugins");
     }
 
Index: apps/nsplugins/plugin_paths.cpp
===================================================================
--- apps/nsplugins/plugin_paths.cpp	(revision 823888)
+++ apps/nsplugins/plugin_paths.cpp	(working copy)
@@ -54,6 +54,8 @@
         paths.append("/usr/lib/mozilla/plugins");
 	paths.append("/usr/lib64/netscape/plugins");
 	paths.append("/usr/lib64/mozilla/plugins");
+	paths.append("/usr/lib64/mozilla/plugins-wrapped");
+	paths.append("/usr/lib/mozilla/plugins-wrapped");
         paths.append("$MOZILLA_HOME/plugins");
         config.writeEntry( "scanPaths", paths );
     }


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- kdebase.spec	5 Jun 2008 14:47:02 -0000	1.326
+++ kdebase.spec	24 Jun 2008 15:43:23 -0000	1.327
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -25,6 +25,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# fedora specific nsplugins paths
+Patch1:   kdebase-nsplugins-paths.patch
+
 ## upstream patches
 # fix Konsole window size (backported from 4.1, #439638, kde#160422)
 # http://websvn.kde.org/?view=rev&revision=793964
@@ -126,6 +129,7 @@
 %prep
 %setup -q -n kdebase-%{version}
 
+%patch1   -p0 -b .nsplugins-paths
 %patch100 -p0 -b .kde#160422
 %patch102 -p1 -b .kwrite-dt_categories
 %patch103 -p1 -b .konqueror-updatehistoryentry
@@ -308,10 +312,14 @@
 
 
 %changelog
-* Thu Jun 05 2008 Than Ngo <than at redhat.com> 4.0.5-3
+* Tue Jun 24 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.5-4
+- #426108: Add more directories to konqueror's default
+  plugin search path list
+
+* Thu Jun 05 2008 Than Ngo <than at redhat.com> - 4.0.5-3
 - backport to fix memleak
 
-* Tue Jun 03 2008 Than Ngo <than at redhat.com> -  4.0.5-2
+* Tue Jun 03 2008 Than Ngo <than at redhat.com> - 4.0.5-2
 - respun tarball from upstream
 
 * Sun Jun 01 2008 Than Ngo <than at redhat.com> 4.0.5-1