[openoffice.org: 1/2] Resolves: rhbz#623613 scripting providers do not work

Thu Aug 12 12:44:31 UTC 2010

commit 990e539b36602aee973ad6eb875ae19f5e823eec
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 12 14:38:48 2010 +0200

    Resolves: rhbz#623613 scripting providers do not work

 .gitignore          |    2 +
 openoffice.org.spec |   59 ++++++++++++++++++++++++++++++++++++++++++--------
 sources             |    2 +
 3 files changed, 53 insertions(+), 10 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 81a0cf4..5cf78e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 OOO330_m3.tar.bz2
+description.xml
+manifest.xml
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 65d4565..fee8ebf 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 3
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -57,6 +57,8 @@ Source14:       http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf
 Source15:       http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 Source16:       http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 Source17:       http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 
+Source18:       description.xml
+Source19:       manifest.xml
 BuildRequires:  zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
 BuildRequires:  binutils, java-devel, boost-devel, zlib-devel, vigra-devel
 BuildRequires:  python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -1829,15 +1831,49 @@ chmod -x $RPM_BUILD_ROOT%{baseinstdir}/extensions/pdfimport.oxt/help/component.t
 
 # revoke ScriptProviders and make into extensions
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/program
+
+# BeanShell
 ../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForBeanShell.jar"
-mkdir $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.zip
-mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.zip
+mkdir $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.oxt \
+     $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.oxt/META-INF
+mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.oxt
+cp %{SOURCE18} $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.oxt
+cp %{SOURCE19} $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.oxt/META-INF
+sed -i -e 's/@display-name@/Script provider for BeanShell/' \
+    -e 's/@version@/%{version}/' \
+    -e 's/@id@/com.sun.star.script.provider.ScriptProviderForBeanShell/' \
+    $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.oxt/description.xml
+sed -i -e 's/@type@/java/' -e 's/@path@/ScriptProviderForBeanShell.jar/' \
+    $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForBeanShell.oxt/META-INF/manifest.xml
+
+# JavaScript
 ../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForJavaScript.jar"
-mkdir $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.zip
-mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.zip
+mkdir $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.oxt \
+     $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.oxt/META-INF
+mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.oxt
+cp %{SOURCE18} $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.oxt
+cp %{SOURCE19} $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.oxt/META-INF
+sed -i -e 's/@display-name@/Script provider for JavaScript/' \
+    -e 's/@version@/%{version}/' \
+    -e 's/@id@/com.sun.star.script.provider.ScriptProviderForJavaScript/' \
+    $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.oxt/description.xml
+sed -i -e 's/@type@/java/' -e 's/@path@/ScriptProviderForJavaScript.jar/' \
+    $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForJavaScript.oxt/META-INF/manifest.xml
+
+# Python
 ../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript
-mkdir $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.zip
-mv pythonscript.py $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.zip
+mkdir $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.oxt \
+     $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.oxt/META-INF
+mv pythonscript.py $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.oxt
+cp %{SOURCE18} $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.oxt
+cp %{SOURCE19} $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.oxt/META-INF
+sed -i -e 's/@display-name@/Script provider for Python/' \
+    -e 's/@version@/%{version}/' \
+    -e 's/@id@/com.sun.star.script.provider.ScriptProviderForPython/' \
+    $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.oxt/description.xml
+sed -i -e 's/@type@/python/' -e 's/@path@/pythonscript.py/' \
+    $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.oxt/META-INF/manifest.xml
+
 popd
 #set timestamp so it'll be the same on all archs for multilib
 touch -r solenv/inc/minor.mk $RPM_BUILD_ROOT%{baseinstdir}/extensions/ScriptProviderForPython.zip/pythonscript.py
@@ -3168,7 +3204,7 @@ unopkg remove --shared com.sun.reportdesigner > /dev/null 2>&1 || :
 %files bsh
 %defattr(-,root,root,-)
 %{basisinstdir}/share/Scripts/beanshell
-%{baseinstdir}/extensions/ScriptProviderForBeanShell.zip
+%{baseinstdir}/extensions/ScriptProviderForBeanShell.oxt
 
 %pre bsh
 # deregister old < 3.3 extension
@@ -3178,7 +3214,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip > /d
 %defattr(-,root,root,-)
 %{basisinstdir}/program/classes/js.jar
 %{basisinstdir}/share/Scripts/javascript
-%{baseinstdir}/extensions/ScriptProviderForJavaScript.zip
+%{baseinstdir}/extensions/ScriptProviderForJavaScript.oxt
 
 %pre rhino
 # deregister old 3.3 extension
@@ -3590,7 +3626,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/share/Scripts/python
 %{python_sitearch}/uno.py*
 %{python_sitearch}/unohelper.py*
-%{baseinstdir}/extensions/ScriptProviderForPython.zip
+%{baseinstdir}/extensions/ScriptProviderForPython.oxt
 %{basisinstdir}/share/registry/pyuno.xcd
 
 %pre pyuno
@@ -3783,6 +3819,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Thu Aug 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.4
+- Resolves: rhbz#623613 scripting providers do not work (dtardon)
+
 * Tue Aug 10 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.3
 - Resolves: rhbz#620574 Presentation for coccinelle: Start slide is a
   complete mess (dtardon)
diff --git a/sources b/sources
index c3accba..ff60bfc 100644
--- a/sources
+++ b/sources
@@ -15,3 +15,5 @@ f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 20613b42d66eadc11c719374355f745c  redhat-langpacks.tar.gz
 011e6e849144d5ca35299f015073652b  redhat-registry.tar.gz
 15af8c5913850a90a14bc15876559655  OOO330_m3.tar.bz2
+5d4db996b3fe3169bb3cc6af22aec605  description.xml
+22be99cb6dbf147543154099d3db0dfa  manifest.xml
