rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.4, 1.5

Mon Sep 5 12:48:27 UTC 2005

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11579

Modified Files:
	openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 
Log Message:
make system bsh additional to internal one

openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch:
 beanshell/makefile.mk                                   |    6 ++
 com/sun/star/sdbcx/comp/hsqldb/makefile.mk              |    0 
 config_office/configure.in                              |   44 ++++++++++++++++
 config_office/set_soenv.in                              |    4 +
 connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk |    9 ++-
 hsqldb/makefile.mk                                      |    6 ++
 scp2/source/ooo/file_ooo.scp                            |    6 +-
 scp2/source/ooo/makefile.mk                             |    8 ++
 scp2/source/ooo/profileitem_ooo.scp                     |    8 ++
 scripting/java/build.xml                                |    1 
 10 files changed, 87 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	1 Sep 2005 09:30:51 -0000	1.4
+++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	5 Sep 2005 12:48:24 -0000	1.5
@@ -245,11 +245,11 @@
 diff -ru scripting.orig/java/build.xml scripting/java/build.xml
 --- openoffice.org.orig/scripting/java/build.xml	2005-08-08 08:52:47.000000000 +0100
 +++ openoffice.org/scripting/java/build.xml	2005-08-08 08:55:34.000000000 +0100
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,8 @@
      <pathelement location="${solar.jar}/juh.jar"/>
      <pathelement location="${solar.jar}/java_uno.jar"/>
      <pathelement location="${solar.jar}/ridl.jar"/>
--    <pathelement location="${solar.jar}/bsh.jar"/>
+     <pathelement location="${solar.jar}/bsh.jar"/>
 +    <pathelement location="/usr/share/java/bsh.jar"/>
      <pathelement location="${solar.jar}/js.jar"/>
      <pathelement location="${jardir}"/>


