packages: opera/opera-pluginpath.patch, opera/opera.spec - rel 2; build/ins...

[arekm]

Author: arekm                        Date: Mon Jul  5 10:38:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; build/install from DEVEL

---- Files affected:
packages/opera:
   opera-pluginpath.patch (1.3 -> 1.4) , opera.spec (1.306 -> 1.307) 

---- Diffs:

================================================================
Index: packages/opera/opera-pluginpath.patch
diff -u packages/opera/opera-pluginpath.patch:1.3 packages/opera/opera-pluginpath.patch:1.4
--- packages/opera/opera-pluginpath.patch:1.3	Tue Mar 23 20:52:52 2010
+++ packages/opera/opera-pluginpath.patch	Mon Jul  5 12:38:17 2010
@@ -1,10 +1,11 @@
---- 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 @@
+--- opera-10.60-6386.x86_64.linux/share/opera/defaults/pluginpath.ini~	2010-07-05 12:35:24.464906567 +0200
++++ opera-10.60-6386.x86_64.linux/share/opera/defaults/pluginpath.ini	2010-07-05 12:36:24.790733975 +0200
+@@ -6,72 +6,8 @@
  plugins=$HOME/.kde/share/config/kcmnspluginrc
  
  [Paths]
 -$PWD/plugins=1
+-$HOME/.local/lib/opera/plugins=1
 +; Netscape Plug-in Paths
 +$HOME/.mozilla/plugins/=1
  $OPERA_PERSONALDIR/plugins=1
@@ -72,3 +73,6 @@
 -/usr/lib/browser-plugins=1
 -
 -; General path for gentoo
+-
+-; Java on Ubuntu
+-/usr/lib/xulrunner-addons/plugins=1

================================================================
Index: packages/opera/opera.spec
diff -u packages/opera/opera.spec:1.306 packages/opera/opera.spec:1.307
--- packages/opera/opera.spec:1.306	Sat Jul  3 19:59:36 2010
+++ packages/opera/opera.spec	Mon Jul  5 12:38:17 2010
@@ -18,7 +18,7 @@
 Summary(pl.UTF-8):	Najszybsza przeglądarka WWW na świecie
 Name:		opera
 Version:	%{ver}
-Release:	1
+Release:	2
 Epoch:		2
 License:	Distributable
 Group:		X11/Applications/Networking
@@ -30,6 +30,8 @@
 # Source12-md5:	4cd09b64a0d1c3826b3e7038326c14dc
 Source0:	%{name}.desktop
 Patch0:		%{name}-wrapper.patch
+Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-pluginpath.patch
 URL:		http://www.opera.com/
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.356
@@ -93,7 +95,30 @@
 %setup -q -T -b 12 -n %{name}-%{version}-%{buildid}.ppc.linux
 %endif
 
+sed -i -e '
+	s,@@{PREFIX},%{_prefix},g
+	s,@@{SUFFIX},,
+	s,@@{_SUFFIX},,
+' share/{applications/*.desktop,mime/packages/*.xml}
+
+sed -i -e 's,kfmclient exec,xdg-open,' share/opera/defaults/filehandler.ini
+
 %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
+mv share/opera/defaults/license.txt .
+mv share/doc/opera/* .
+
+# nobody wants scalable huge icons
+rm -rf share/icons/hicolor/scalable
+
+# opera packaging tools we don't need runtime
+mv share/opera/package .
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -107,20 +132,10 @@
 mplayerplug-in*
 EOF
 
-%ifarch %{x8664}
-install -d $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/plugins
-%browser_plugins_add_browser %{name} -a %{alt_arch} -p %{_prefix}/lib/%{name}/plugins -b <<'EOF'
-# opera does not use for .xpt files
-*.xpt
-
-# use mplayerplug-in-opera instead
-mplayerplug-in*
-EOF
-%endif
-
 install -p opera* $RPM_BUILD_ROOT%{_bindir}
 cp -a lib/opera $RPM_BUILD_ROOT%{_libdir}
 cp -a share/* $RPM_BUILD_ROOT%{_datadir}
+#cp -a etc/*.ini $RPM_BUILD_ROOT%{_sysconfdir}
 
 sed -i -e 's#/usr/lib/opera#%{_libdir}/opera#g' $RPM_BUILD_ROOT%{_bindir}/opera
 
@@ -143,9 +158,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%update_mime_database
+%update_icon_cache hicolor
+%update_desktop_database_post
 %update_browser_plugins
 
 %postun
+%update_mime_database
+%update_icon_cache hicolor
+%update_desktop_database_postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
@@ -239,7 +260,6 @@
 %{_mandir}/man1/opera.1*
 %{_mandir}/man1/opera-widget-manager.1*
 %{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/*/*/*.svg
 
 %ifarch %{x8664}
 %files plugin32
@@ -253,6 +273,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.307  2010/07/05 10:38:17  arekm
+- rel 2; build/install from DEVEL
+
 Revision 1.306  2010/07/03 17:59:36  arekm
 - ini is back; debuginfo package disabled as it makes no sense here
 
================================================================

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