rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.16, 1.17

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 
Log Message:
try and figure out ant env stuff

openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch:
 com/sun/star/sdbcx/comp/hsqldb/makefile.mk              |    0 
 config/ssrc680.ini                                      |    0 
 config_office/configure.in                              |   71 ++++++++++++++++
 config_office/set_soenv.in                              |    4 
 connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk |    7 +
 connectivity/prj/build.lst                              |    2 
 java/build.xml                                          |    0 
 prj/build.lst                                           |    0 
 scp2/source/ooo/file_ooo.scp                            |    6 -
 scp2/source/ooo/makefile.mk                             |   15 +++
 scp2/source/ooo/profileitem_ooo.scp                     |    3 
 scripting/java/build.xml                                |    5 -
 scripting/prj/build.lst                                 |    2 
 solenv/config/ssrc680.ini                               |    2 
 source/ooo/file_ooo.scp                                 |    0 
 source/ooo/makefile.mk                                  |    0 
 source/ooo/profileitem_ooo.scp                          |    0 
 17 files changed, 107 insertions(+), 10 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	23 Nov 2005 13:12:44 -0000	1.16
+++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	23 Nov 2005 13:27:36 -0000	1.17
@@ -225,25 +225,22 @@
 diff -u -r1.32 build.xml
 --- openoffice.org.orig/scripting/java/build.xml	9 Sep 2005 01:54:21 -0000	1.32
 +++ openoffice.org/scripting/java/build.xml	22 Nov 2005 16:58:02 -0000
-@@ -50,6 +50,12 @@
+@@ -50,6 +50,9 @@
         Not needed in default build -->
    <property name="netbeans.install.path" value="/export/home/netbeans"/>
  
 +  <property environment="env"/>
-+  <property name="bshjar" value="${solar.jar}/bsh.jar"/>
-+  <condition property="bshjar" value="${env.BSH_JAR}">
-+    <isset property='${env.SYSTEM_BSH}'/>
-+  </condition>
++  <property name="env.BSH_JAR" value="${solar.jar}/bsh.jar"/>
 +
    <!-- ==================== classpath setting ============================ -->
    <path id="idlclasspath">
      <pathelement location="${solar.jar}/jurt.jar"/>
-@@ -58,7 +64,7 @@
+@@ -58,7 +61,7 @@
      <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="${bshjar}"/>
++    <pathelement location="${env.BSH_JAR}"/>
      <pathelement location="${solar.jar}/js.jar"/>
      <pathelement location="${jardir}"/>
    </path>