rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 
Log Message:
drop that part of the patch

openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch:
 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 ++-
 connectivity/prj/build.lst                              |    2 
 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 
 scripting/prj/build.lst                                 |    2 
 10 files changed, 77 insertions(+), 7 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	9 Sep 2005 08:34:25 -0000	1.6
+++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	16 Sep 2005 07:51:42 -0000	1.7
@@ -72,26 +72,6 @@
  JAVAFILES =\
  	NativeInputStreamHelper.java\
  	NativeOutputStreamHelper.java\
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/external/hsqldb/makefile.mk,v
-retrieving revision 1.9
-diff -u -p -r1.9 makefile.mk
---- openoffice.org.orig/hsqldb/makefile.mk	20 Jul 2005 13:24:41 -0000	1.9
-+++ openoffice.org/hsqldb/makefile.mk	4 Aug 2005 14:58:27 -0000
-@@ -69,6 +69,12 @@ TARGET=so_hsqldb
- .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 --------------------------------------------------------
- 
 diff -ru scp2.orig/source/ooo/file_ooo.scp scp2/source/ooo/file_ooo.scp
 --- openoffice.org.orig/scp2/source/ooo/file_ooo.scp	2005-08-04 12:56:17.000000000 +0100
 +++ openoffice.org/scp2/source/ooo/file_ooo.scp	2005-08-04 12:57:32.000000000 +0100
@@ -134,22 +114,6 @@
 +#endif
  End
  
-diff -ru beanshell.orig/makefile.mk beanshell/makefile.mk
---- openoffice.org.orig/beanshell/makefile.mk	2005-08-08 08:42:40.000000000 +0100
-+++ openoffice.org/beanshell/makefile.mk	2005-08-08 08:43:19.000000000 +0100
-@@ -70,6 +70,12 @@
- 
- .INCLUDE :	settings.mk
- 
-+.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
-+
- # --- Files --------------------------------------------------------
- 
- TARFILE_NAME=bsh-2.0b1-src
 diff -ru config_office.orig/configure.in config_office/configure.in
 --- openoffice.org.orig/config_office/configure.in	2005-08-08 08:34:55.000000000 +0100
 +++ openoffice.org/config_office/configure.in	2005-08-08 08:36:50.000000000 +0100