rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 
Log Message:
stripped out for FC5

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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	23 Nov 2005 09:49:56 -0000	1.13
+++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	23 Nov 2005 10:02:15 -0000	1.14
@@ -1,24 +1,3 @@
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/external/beanshell/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- openoffice.org.orig/beanshell/makefile.mk	7 Sep 2005 22:05:31 -0000	1.5
-+++ openoffice.org/beanshell/makefile.mk	22 Nov 2005 16:18:35 -0000
-@@ -39,6 +39,13 @@
- TARGET=ooo_beanshell
- 
- .IF "$(SOLAR_JAVA)"!=""
-+
-+.IF "$(SYSTEM_BSH)" == "YES"
-+all:
-+        @echo "An already available installation of beanshell should exist on your system."
-+        @echo "Therefore the version provided here does not need to be built in addition."
-+.ENDIF
-+
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :	settings.mk
 Index: configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
@@ -163,26 +142,6 @@
  cn	connectivity							usr1	-	all	cn_mkout NULL
  cn	connectivity\com\sun\star\sdbcx\comp\hsqldb	nmake	-	all	cn_jhsqldbdb cn_hsqldb NULL
  cn	connectivity\source\types			nmake	-	all	cn_types NULL
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/external/hsqldb/makefile.mk,v
-retrieving revision 1.10
-diff -u -r1.10 makefile.mk
---- openoffice.org.orig/hsqldb/makefile.mk	7 Sep 2005 16:27:52 -0000	1.10
-+++ openoffice.org/hsqldb/makefile.mk	22 Nov 2005 16:17:49 -0000
-@@ -44,6 +44,12 @@
- .INCLUDE :  version.mk
- .INCLUDE :	minor.mk
- 
-+.IF "$(SYSTEM_HSQLDB)" == "YES"
-+all:
-+	@echo "An already available installation of hsqldb should exist on your system."
-+	@echo "Therefore the version provided here does not need to be built in addition."
-+.ENDIF
-+
- .IF "$(SOLAR_JAVA)" != ""
- # --- Files --------------------------------------------------------
- 
 Index: source/ooo/file_ooo.scp
 ===================================================================
 RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v