rpms/kdebase/devel kdebase-nsplugins-paths.patch, NONE, 1.1 kdebase.spec, 1.329, 1.330

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3239

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/devel/kdebase.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- kdebase.spec	20 Jun 2008 12:14:24 -0000	1.329
+++ kdebase.spec	24 Jun 2008 15:49:17 -0000	1.330
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.0.83
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -25,6 +25,9 @@
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{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
 
 BuildRequires: kde-filesystem >= 4
@@ -120,10 +123,9 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-
+%patch1   -p0 -b .nsplugins-paths
 
 %build
-
 mkdir -p %{_target_platform} 
 pushd %{_target_platform}
 %{cmake_kde4} ..
@@ -299,6 +301,10 @@
 
 
 %changelog
+* Tue Jun 24 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.83-2
+- #426108: Add more directories to konqueror's default
+  plugin search path list
+
 * Thu Jun 19 2008 Than Ngo <than at redhat.com> 4.0.83-1
 - 4.0.83 (beta2)