packages (DEVEL): opera/opera-pluginpath.patch, opera/opera.spec - make plu...

[glen]

Author: glen                         Date: Tue Mar 23 19:52:57 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- make plugins patch work for x64_86 as well (with some sanity that large change in file won't get unnoticed)

---- Files affected:
packages/opera:
   opera-pluginpath.patch (1.2 -> 1.3) , opera.spec (1.246.2.74.2.35 -> 1.246.2.74.2.36) 

---- Diffs:

================================================================
Index: packages/opera/opera-pluginpath.patch
diff -u packages/opera/opera-pluginpath.patch:1.2 packages/opera/opera-pluginpath.patch:1.3
--- packages/opera/opera-pluginpath.patch:1.2	Sat Mar 20 16:12:40 2010
+++ packages/opera/opera-pluginpath.patch	Tue Mar 23 20:52:52 2010
@@ -1,6 +1,9 @@
---- opera-10.51-6252.i386.linux/share/opera/defaults/pluginpath.ini	2010-03-20 15:40:34.551656601 +0200
-+++ opera-10.51-6252.i386.linux/share/opera/defaults/pluginpath.ini	2010-03-20 17:05:02.372607367 +0200
-@@ -9,67 +9,5 @@
+--- opera-10.51-6252.x86_64.linux/share/opera/defaults/pluginpath.ini~	2010-03-23 19:31:41.000000000 +0200
++++ opera-10.51-6252.x86_64.linux/share/opera/defaults/pluginpath.ini	2010-03-23 19:32:13.101013292 +0200
+@@ -6,68 +6,8 @@
+ plugins=$HOME/.kde/share/config/kcmnspluginrc
+ 
+ [Paths]
 -$PWD/plugins=1
 +; Netscape Plug-in Paths
 +$HOME/.mozilla/plugins/=1
@@ -66,8 +69,6 @@
 -; be some in the Mozilla plugin directory.
 -/usr/lib/mozilla/plugins=1
 -/usr/X11R6/lib/mozilla/plugins=1
--/usr/lib64/browser-plugins=1
 -/usr/lib/browser-plugins=1
 -
 -; General path for gentoo
--/usr/lib32/nsbrowser/plugins=1

================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.246.2.74.2.35 packages/opera/opera.spec:1.246.2.74.2.36
--- packages/opera/opera.spec:1.246.2.74.2.35	Sun Mar 21 12:22:48 2010
+++ packages/opera/opera.spec	Tue Mar 23 20:52:52 2010
@@ -71,6 +71,7 @@
 %endif
 %ifarch %{x8664}
 %setup -q -T -b1 -n %{name}-%{version}-%{subver}.x86_64.linux
+
 %endif
 sed -i -e '
 	s,@@{PREFIX},%{_prefix},g
@@ -82,6 +83,9 @@
 
 %patch0 -p1
 %patch1 -p1
+
+# remove lib32/lib64 paths so patch2 can apply (i386 build contained lib64 as well, oh well)
+%{__sed} -i -e '/lib32\|lib64/d;$d' share/opera/defaults/pluginpath.ini
 %patch2 -p1
 
 mv lib/opera/plugins/README README.plugins
@@ -222,6 +226,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.246.2.74.2.36  2010/03/23 19:52:52  glen
+- make plugins patch work for x64_86 as well (with some sanity that large change in file won't get unnoticed)
+
 Revision 1.246.2.74.2.35  2010/03/21 11:22:48  glen
 - update icon cache
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera-pluginpath.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.246.2.74.2.35&r2=1.246.2.74.2.36&f=u