rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.15, 1.16
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Nov 23 13:12:48 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12226
Modified Files:
openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
Log Message:
reversed
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 | 8 +
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, 110 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 23 Nov 2005 13:06:33 -0000 1.15
+++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 23 Nov 2005 13:12:44 -0000 1.16
@@ -231,8 +231,8 @@
+ <property environment="env"/>
+ <property name="bshjar" value="${solar.jar}/bsh.jar"/>
-+ <condition property="bshjar" value="${env.SYSTEM_BSH}">
-+ <isset property='${env.BSH_JAR}'/>
++ <condition property="bshjar" value="${env.BSH_JAR}">
++ <isset property='${env.SYSTEM_BSH}'/>
+ </condition>
+
<!-- ==================== classpath setting ============================ -->
More information about the fedora-cvs-commits
mailing list