Author: glen Date: Thu Jun 12 17:51:50 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add browser-plugins v2 system to -plugin32
---- Files affected:
SPECS:
opera.spec (1.266 -> 1.267)
---- Diffs:
================================================================
Index: SPECS/opera.spec
diff -u SPECS/opera.spec:1.266 SPECS/opera.spec:1.267
--- SPECS/opera.spec:1.266 Thu Jun 12 18:25:05 2008
+++ SPECS/opera.spec Thu Jun 12 19:51:44 2008
@@ -41,6 +41,8 @@
%define _plugindir %{_libdir}/opera/plugins
%define _operadocdir %{_docdir}/%{name}-%{ver}
+# alternative arch for plugin32
+%define alt_arch i386
%description
Opera is world fastest web browser. It supports most of nowaday
@@ -57,6 +59,7 @@
Summary(pl.UTF-8): Obsługa 32-bitowych wtyczek Opery
Group: X11/Applications/Networking
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: browser-plugins >= 2.0
%description plugin32
Opera 32-bit plugins support.
@@ -91,6 +94,20 @@
libjavaplugin_oji.so
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*
+
+# opera uses libjava.so to run java
+libjavaplugin_oji.so
+EOF
+%endif
+
sh install.sh \
DESTDIR=$RPM_BUILD_ROOT \
--prefix=%{_prefix} \
@@ -115,14 +132,22 @@
%update_browser_plugins
fi
+%post plugin32
+%update_browser_plugins
+
+%postun plugin32
+if [ "$1" = 0 ]; then
+ %update_browser_plugins
+fi
+
%files
%defattr(644,root,root,755)
%doc LICENSE
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opera*rc*
# browser plugins v2
-%{_browserpluginsconfdir}/browsers.d/%{name}.*
-%config(noreplace) %verify(not md5 mtime size)
%{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
+%{_browserpluginsconfdir}/browsers.d/%{name}.%{_target_base_arch}
+%config(noreplace) %verify(not md5 mtime size)
%{_browserpluginsconfdir}/blacklist.d/%{name}.%{_target_base_arch}.blacklist
%attr(755,root,root) %{_bindir}/*
%dir %{_libdir}/opera
@@ -181,7 +206,12 @@
%ifarch %{x8664}
%files plugin32
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/opera/bin/*-ia32-*
+# browser plugins v2
+%{_browserpluginsconfdir}/browsers.d/%{name}.%{alt_arch}
+%config(noreplace) %verify(not md5 mtime size)
%{_browserpluginsconfdir}/blacklist.d/%{name}.%{alt_arch}.blacklist
+%dir %{_prefix}/lib/%{name}
+%dir %{_prefix}/lib/%{name}/plugins
+%attr(755,root,root) %{_libdir}/%{name}/bin/*-ia32-*
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -190,11 +220,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.267 2008-06-12 17:51:44 glen
+- add browser-plugins v2 system to -plugin32
+
Revision 1.266 2008-06-12 16:25:05 qboosh
- unified: just lang(es) for es_ES
Revision 1.265 2008-06-12 14:14:14 glen
- update for discarded shared/static bcond, cosmetics
+- update for discarded shared/static bcond, cosmetics
Revision 1.264 2008-06-12 14:10:08 glen
- release 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/opera.spec?r1=1.266&r2=1.267&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
