rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 
Log Message:
post integration

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                                |    2 
 solenv/config/ssrc680.ini                               |    4 -
 11 files changed, 89 insertions(+), 8 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	23 Aug 2005 19:02:52 -0000	1.1
+++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch	1 Sep 2005 09:01:09 -0000	1.2
@@ -268,12 +268,12 @@
 diff -ru solenv.ori/config/ssrc680.ini solenv/config/ssrc680.ini
 --- openoffice.org.orig/solenv/config/ssrc680.ini	2005-08-08 08:41:21.000000000 +0100
 +++ openoffice.org/solenv/config/ssrc680.ini	2005-08-08 08:41:40.000000000 +0100
-@@ -113,7 +113,7 @@
+@@ -108,7 +108,7 @@
  			BIG_SVX TRUE
  			BIG_GOODIES TRUE
  			BMP_WRITES_FLAG TRUE
--            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK
-+            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC HSQLDB BSH MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK
+-            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST
++            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST HSQLDB BSH
  			RES_ENUS TRUE
  			RES_GER TRUE
  			NO_REC_RES TRUE