rpms/kdebase/devel kdebase-4.1.80-nsplugins-paths.patch, NONE, 1.1 kdebase.spec, 1.348, 1.349 kdebase-nsplugins-paths.patch, 1.1, NONE

[Lorenzo Villani]

Author: arbiter

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.1.80-nsplugins-paths.patch 
Removed Files:
	kdebase-nsplugins-paths.patch 
Log Message:
- rebase nsplugins-path patch

kdebase-4.1.80-nsplugins-paths.patch:

--- NEW FILE kdebase-4.1.80-nsplugins-paths.patch ---
diff -Naur kdebase-4.1.80/apps/konqueror/settings/konqhtml/pluginopts.cpp kdebase-4.1.80.nsplugins-path/apps/konqueror/settings/konqhtml/pluginopts.cpp
--- kdebase-4.1.80/apps/konqueror/settings/konqhtml/pluginopts.cpp	2008-10-19 18:53:24.000000000 +0200
+++ kdebase-4.1.80.nsplugins-path/apps/konqueror/settings/konqhtml/pluginopts.cpp	2008-11-23 22:43:09.000000000 +0100
@@ -430,6 +430,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");
     }

diff -Naur kdebase-4.1.80/apps/nsplugins/plugin_paths.cpp kdebase-4.1.80.nsplugins-path/apps/nsplugins/plugin_paths.cpp
--- kdebase-4.1.80/apps/nsplugins/plugin_paths.cpp	2008-11-11 22:58:32.000000000 +0100
+++ kdebase-4.1.80.nsplugins-path/apps/nsplugins/plugin_paths.cpp	2008-11-23 22:43:09.000000000 +0100
@@ -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/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- kdebase.spec	20 Nov 2008 13:03:33 -0000	1.348
+++ kdebase.spec	25 Nov 2008 14:10:12 -0000	1.349
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.1.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -26,7 +26,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fedora specific nsplugins paths
-Patch0:   kdebase-nsplugins-paths.patch
+Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 # Konsole patches
 Patch1:   kdebase-4.1.70-konsole-session.patch
 
@@ -123,7 +123,7 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch0 -p0 -b .nsplugins-paths
+%patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 
 # fix incorrect assumption that we're building in a combined kdebase tree
@@ -305,6 +305,9 @@
 
 
 %changelog
+* Sun Nov 23 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-3
+- rebase nsplugins-path patch
+
 * Thu Nov 20 2008 Than Ngo <than at redhat.com>  4.1.80-2
 - merged
 


--- kdebase-nsplugins-paths.patch DELETED ---