rpms/openoffice.org/devel openoffice.org.spec,1.1557,1.1558

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18066

Modified Files:
	openoffice.org.spec 
Log Message:
split out script providers


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1557
retrieving revision 1.1558
diff -u -r1.1557 -r1.1558
--- openoffice.org.spec	4 Jul 2008 23:05:10 -0000	1.1557
+++ openoffice.org.spec	6 Jul 2008 13:47:37 -0000	1.1558
@@ -1,6 +1,6 @@
 %define oootag DEV300
 %define ooomilestone 22
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -152,7 +152,6 @@
 Group: Applications/Productivity
 Requires: liberation-fonts
 Requires: hunspell-en, hyphen-en
-Requires: bsh
 Requires: hsqldb, xalan-j2, xerces-j2
 PreReq: gtk2 >= 2.9.4
 Requires(post): shared-mime-info
@@ -187,7 +186,7 @@
 The shared core branding files for BrOffice.org
 
 %package pyuno
-Summary: Python bindings for %{name}
+Summary: Python support for %{name}
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: python
@@ -237,6 +236,23 @@
 and page headers as well as group, page footers and calculation fields to
 accomplish complex database reports.
 
+%package bsh
+Summary: BeanShell support for %{name}
+Group: Development/Libraries
+Requires: bsh
+Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
+
+%description bsh
+Support BeanShell scripts in %{name}.
+
+%package rhino
+Summary: JavaScript support for %{name}
+Group: Development/Libraries
+Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
+
+%description rhino
+Support JavaScript scripts in %{name}.
+
 %package wiki-publisher
 Summary: Create Wiki articles on MediaWiki servers with %{name}
 Group: Applications/Productivity
@@ -1486,6 +1502,19 @@
 install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt
 
+# revoke ScriptProviders and make into extensions
+pushd $RPM_BUILD_ROOT/%{basisinstdir}/program
+regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$UNO_JAVA_COMPONENT_PATH/ScriptProviderForBeanShell.jar"
+mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
+mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
+regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$UNO_JAVA_COMPONENT_PATH/ScriptProviderForJavaScript.jar"
+mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
+mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
+regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript
+mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
+mv pythonscript.py* $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
+popd
+
 #add enough to the sdk to build the kde vcl plug out of tree
 cp -r solenv/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk
 cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{baseinstdir}/sdk/linux/bin
@@ -2035,7 +2064,6 @@
 %{basisinstdir}/program/classes/commonwizards.jar
 %{basisinstdir}/program/classes/fax.jar
 %{basisinstdir}/program/classes/form.jar
-%{basisinstdir}/program/classes/js.jar
 %{basisinstdir}/program/classes/jut.jar          
 %{basisinstdir}/program/classes/query.jar          
 %{basisinstdir}/program/classes/letter.jar          
@@ -2044,9 +2072,7 @@
 %{basisinstdir}/program/classes/report.jar
 %{basisinstdir}/program/classes/sdbc_hsqldb.jar
 %{basisinstdir}/program/classes/ScriptFramework.jar
-%{basisinstdir}/program/classes/ScriptProviderForBeanShell.jar
 %{basisinstdir}/program/classes/ScriptProviderForJava.jar
-%{basisinstdir}/program/classes/ScriptProviderForJavaScript.jar
 %{basisinstdir}/program/classes/table.jar
 %{basisinstdir}/program/classes/unoil.jar
 %{basisinstdir}/program/classes/web.jar
@@ -2301,9 +2327,7 @@
 %{basisinstdir}/program/cairocanvas.uno.so
 %dir %{basisinstdir}/share
 %dir %{basisinstdir}/share/Scripts
-%{basisinstdir}/share/Scripts/beanshell
 %{basisinstdir}/share/Scripts/java
-%{basisinstdir}/share/Scripts/javascript
 %dir %{basisinstdir}/share/autocorr
 %if %{langpacks}
 %{basisinstdir}/share/autocorr/acor_en-*.dat
@@ -2866,6 +2890,57 @@
     # clear disk cache
     unopkg list --shared > /dev/null 2>&1 || :
 
+%files bsh
+%defattr(-,root,root,-)
+%{basisinstdir}/share/Scripts/beanshell
+%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
+
+%pre bsh
+if [ $1 -gt 1 ]; then
+    # Upgrade => deregister old extension
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip || :
+fi
+
+%post bsh
+    # register extension
+    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip > /dev/null || :
+
+%preun bsh
+if [ $1 -eq 0 ]; then
+    # not upgrading => deregister
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip || :
+fi
+
+%postun bsh
+    # clear disk cache
+    unopkg list --shared > /dev/null 2>&1 || :
+
+%files rhino
+%defattr(-,root,root,-)
+%{basisinstdir}/program/classes/js.jar
+%{basisinstdir}/share/Scripts/javascript
+%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
+
+%pre rhino
+if [ $1 -gt 1 ]; then
+    # Upgrade => deregister old extension
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip || :
+fi
+
+%post rhino
+    # register extension
+    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip > /dev/null || :
+
+%preun rhino
+if [ $1 -eq 0 ]; then
+    # not upgrading => deregister
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip || :
+fi
+
+%postun rhino
+    # clear disk cache
+    unopkg list --shared > /dev/null 2>&1 || :
+
 %files wiki-publisher
 %defattr(-,root,root,-)
 %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
@@ -3472,7 +3547,6 @@
 %{basisinstdir}/program/pythonloader.py*
 %{basisinstdir}/program/pythonloader.uno.so
 %{basisinstdir}/program/pythonloader.unorc
-%{basisinstdir}/program/pythonscript.py*
 %{basisinstdir}/program/pyuno.so
 %dir %{basisinstdir}/share
 %dir %{basisinstdir}/share/Scripts
@@ -3486,8 +3560,33 @@
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 %{python_py_sitearch}/uno.py*
 %{python_py_sitearch}/unohelper.py*
+%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
+
+%pre pyuno
+if [ $1 -gt 1 ]; then
+    # Upgrade => deregister old extension
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip || :
+fi
+
+%post pyuno
+    # register extension
+    unopkg add --shared --link %{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip > /dev/null || :
+
+%preun pyuno
+if [ $1 -eq 0 ]; then
+    # not upgrading => deregister
+    unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip || :
+fi
+
+%postun pyuno
+    # clear disk cache
+    unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Sat Jul 05 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.22-2
+- split out arcane ScriptProviders out of core into optional extensions 
+  => bsh now only required by beanshell ScriptProvider
+
 * Tue Jul 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.22-1
 - next version
 - drop integrated pseudoworkspace.valgrind1.patch