packages (DEVEL): opera/opera.spec - scan plugins from paths we want, not a...

[glen]

Author: glen                         Date: Sat Mar 20 15:04:54 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- scan plugins from paths we want, not all random places

---- Files affected:
packages/opera:
   opera.spec (1.246.2.74.2.33 -> 1.246.2.74.2.34) 

---- Diffs:

================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.246.2.74.2.33 packages/opera/opera.spec:1.246.2.74.2.34
--- packages/opera/opera.spec:1.246.2.74.2.33	Sat Mar 20 14:48:10 2010
+++ packages/opera/opera.spec	Sat Mar 20 16:04:45 2010
@@ -23,9 +23,11 @@
 %{!?with_distributable:NoSource:	1}
 Patch0:		%{name}-wrapper.patch
 Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-pluginpath.patch
 URL:		http://www.opera.com/
 BuildRequires:	rpmbuild(macros) >= 1.356
 BuildRequires:	sed >= 4.0
+Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	shared-mime-info
 Requires:	browser-plugins >= 2.0
 Requires:	freetype >= 2
@@ -72,12 +74,16 @@
 	s,@@{PREFIX},%{_prefix},g
 	s,@@{SUFFIX},,
 	s,@@{_SUFFIX},,
-' share/applications/*.desktop
+' share/{applications/*.desktop,mime/packages/*.xml}
+
+sed -i -e 's,kfmclient exec,xdg-open,' share/opera/defaults/filehandler.ini
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 mv lib/opera/plugins/README README.plugins
+mv share/opera/defaults/license.txt .
 mv share/doc/opera/* .
 
 # nobody wants scalable huge icons
@@ -110,10 +116,12 @@
 
 %post
 %update_mime_database
+%update_desktop_database_post
 %update_browser_plugins
 
 %postun
 %update_mime_database
+%update_desktop_database_postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
@@ -210,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.246.2.74.2.34  2010/03/20 15:04:45  glen
+- scan plugins from paths we want, not all random places
+
 Revision 1.246.2.74.2.33  2010/03/20 13:48:10  glen
 - update to 10.51, build 6252
 
@@ -304,7 +315,7 @@
 - up to 4520
 
 Revision 1.246.2.74.2.2  2009/07/22 07:17:13  arekm
-qt3 by default
+- qt3 by default
 
 Revision 1.246.2.74.2.1  2009/07/21 20:30:37  charles
 - up to 4502
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opera/opera.spec?r1=1.246.2.74.2.33&r2=1.246.2.74.2.34&f=u