- browser-plugins subpackage

Changed files:
    libreoffice.spec -> 1.720

diff --git a/libreoffice.spec b/libreoffice.spec
index f497af4ed9615fbe04f443706de9ea79803a6e77..394ed496f56833632cd2ac5e595a45eadf4ceb27 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -71,7 +71,7 @@
 %endif
 
 %define                ver             2.1.0
-%define                _rel            0.21
+%define                _rel            0.22
 %define                subver          680
 %define                snap            OOE680
 %define                snap2           SRC680
@@ -189,7 +189,7 @@ BuildRequires:      python >= 2.2
 BuildRequires: python-devel >= 2.2
 BuildRequires: python-modules >= 2.2
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: rpmbuild(macros) >= 1.357
 BuildRequires: sablotron-devel
 BuildRequires: sane-backends-devel
 BuildRequires: sed >= 4.0
@@ -514,6 +514,18 @@ OpenSymbol TrueType fonts.
 %description -n fonts-TTF-OpenSymbol -l pl.UTF-8
 Fonty TrueType OpenSymbol.
 
+%package -n browser-plugin-%{name}
+Summary:       OpenOffice.org plugin for WWW browsers
+Group:         X11/Applications
+Requires:      %{name}-core = %{epoch}:%{version}-%{release}
+Requires:      browser-plugins >= 2.0
+Requires:      browser-plugins(%{_target_base_arch})
+
+%description -n browser-plugin-%{name}
+OpenOffice.org plugin for WWW browsers.
+
+This plugin allows browsers to display OOo documents inline.
+
 %package i18n-af
 Summary:       OpenOffice.org - interface in Afrikaans language
 Summary(pl.UTF-8):     OpenOffice.org - interfejs w języku afrykanerskim
@@ -2279,6 +2291,14 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/dictionary.lst
 %endif
 
+%if %{with mozilla}
+install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+# this is for options -> browser plugin -> enable to work
+# altho in PLD Linux browser-plugins archidecture takes care of that
+ln -s %{_browserpluginsdir}/libnpsoplugin.so $RPM_BUILD_ROOT%{_libdir}/%{name}/program
+%endif
+
 # is below comment true?
 # OOo should not install the Vera fonts, they are Required: now
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/fonts/truetype/*
@@ -2423,6 +2443,14 @@ fontpostinst TTF
 %postun -n fonts-TTF-OpenSymbol
 fontpostinst TTF
 
+%post -n browser-plugin-%{name}
+%update_browser_plugins
+
+%postun -n browser-plugin-%{name}
+if [ "$1" = 0 ]; then
+       %update_browser_plugins
+fi
+
 # NOTE:
 # you may find build/*_list.txt useful to help you package files to packages
 
@@ -2816,9 +2844,6 @@ fontpostinst TTF
 %attr(755,root,root) %{_libdir}/%{name}/program/soffice
 %attr(755,root,root) %{_libdir}/%{name}/program/spadmin
 %attr(755,root,root) %{_libdir}/%{name}/program/open-url
-%if %{with mozilla}
-%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
-%endif
 %attr(755,root,root) %{_libdir}/%{name}/program/gengal
 %attr(755,root,root) %{_libdir}/%{name}/program/configimport
 %attr(755,root,root) %{_libdir}/%{name}/program/sbase
@@ -3106,7 +3131,6 @@ fontpostinst TTF
 %attr(755,root,root) %{_libdir}/%{name}/program/libmdb680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmdbimpl680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmysql2.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libnpsoplugin.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libodbc2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libodbcbase2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/liboffacc680*.so
@@ -3493,6 +3517,14 @@ fontpostinst TTF
 # samples there
 %{_libdir}/%{name}/share/Scripts/python
 
+%if %{with mozilla}
+%files -n browser-plugin-%{name}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
+%attr(755,root,root) %{_browserpluginsdir}/libnpsoplugin.so
+%{_libdir}/%{name}/program/libnpsoplugin.so
+%endif
+
 %if %{with i18n}
 %files i18n-af -f af.lang
 %defattr(644,root,root,755)