rpms/openoffice.org/devel openoffice.org-1.9.122.ooo52974.systembeanshell.patch, NONE, 1.1 openoffice.org-1.9.122.ooo52974.systemhsqldb.patch, NONE, 1.1 openoffice.org.spec, 1.374, 1.375 openoffice.org-1.9.122.oooXXXXX.systemhsqldb.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Aug 8 08:06:50 UTC 2005
- Previous message (by thread): rpms/kernel/devel patch-2.6.13-rc6.bz2.sign, NONE, 1.1 .cvsignore, 1.190, 1.191 kernel-2.6.spec, 1.1455, 1.1456 sources, 1.146, 1.147 upstream, 1.122, 1.123 patch-2.6.13-rc5.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/gnutls/devel gnutls.spec,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18081
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.122.ooo52974.systembeanshell.patch
openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
Removed Files:
openoffice.org-1.9.122.oooXXXXX.systemhsqldb.patch
Log Message:
use system beanshell
openoffice.org-1.9.122.ooo52974.systembeanshell.patch:
beanshell/makefile.mk | 6 ++++++
config_office/configure.in | 22 ++++++++++++++++++++++
config_office/set_soenv.in | 2 ++
scp2/source/ooo/file_ooo.scp | 4 ++--
scp2/source/ooo/makefile.mk | 4 ++++
scp2/source/ooo/profileitem_ooo.scp | 2 +-
scripting/java/build.xml | 2 +-
solenv/config/ssrc680.ini | 2 +-
8 files changed, 39 insertions(+), 5 deletions(-)
--- NEW FILE openoffice.org-1.9.122.ooo52974.systembeanshell.patch ---
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
@@ -260,6 +260,9 @@
AC_ARG_WITH(system-hsqldb,
[ --with-system-hsqldb Use hsqldb already on system
],,)
+AC_ARG_WITH(system-beanshell,
+[ --with-system-beanshell Use beanshell already on system
+],,)
AC_ARG_WITH(system-altlinuxhyph,
[ --with-system-altlinuxhyph Use ALTLinuxhyph already on system
],,)
@@ -3132,6 +3135,25 @@
AC_SUBST(HSQLDB_JAR)
dnl ===================================================================
+dnl Check for system beanshell
+dnl ===================================================================
+AC_MSG_CHECKING([which beanshell to use])
+if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
+ test "$with_system_beanshell" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_BSH=YES
+ BSH_JAR=/usr/share/java/bsh.jar
+ AC_CHECK_FILE($BSH_JAR, [],
+ [AC_MSG_ERROR(bsh.jar not found.)], [])
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_BSH=NO
+ BUILD_TYPE="$BUILD_TYPE BSH"
+fi
+AC_SUBST(SYSTEM_BSH)
+AC_SUBST(BSH_JAR)
+
+dnl ===================================================================
dnl Check for system xmlsec1
dnl ===================================================================
AC_MSG_CHECKING([which xmlsec1 to use])
diff -ru config_office.orig/set_soenv.in config_office/set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in 2005-08-08 08:34:55.000000000 +0100
+++ openoffice.org/config_office/set_soenv.in 2005-08-08 08:37:30.000000000 +0100
@@ -1763,6 +1763,8 @@
ToFile( "SYSTEM_XMLSEC", "@SYSTEM_XMLSEC@", "e" );
ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" );
ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );
+ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" );
+ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
ToFile( "PAM_LINK", "@PAM_LINK@", "e" );
ToFile( "CRYPT_LINK", "@CRYPT_LINK@", "e" );
ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" );
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-08 08:45:11.000000000 +0100
+++ openoffice.org/scp2/source/ooo/file_ooo.scp 2005-08-08 08:47:36.000000000 +0100
@@ -624,9 +624,9 @@
#endif
#ifdef SOLAR_JAVA
-
+#ifndef SYSTEM_BSH
STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
-
+#endif
#endif
#ifdef SOLAR_JAVA
diff -ru scp2.orig/source/ooo/makefile.mk scp2/source/ooo/makefile.mk
--- openoffice.org.orig/scp2/source/ooo/makefile.mk 2005-08-08 08:45:11.000000000 +0100
+++ openoffice.org/scp2/source/ooo/makefile.mk 2005-08-08 08:47:53.000000000 +0100
@@ -166,6 +166,10 @@
SCPDEFS+=-DSYSTEM_HSQLDB
.ENDIF
+.IF "$(SYSTEM_BSH)" == "YES"
+SCPDEFS+=-DSYSTEM_BSH
+.ENDIF
+
SCPDEFS+=\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
diff -ru scp2.orig/source/ooo/profileitem_ooo.scp scp2/source/ooo/profileitem_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 2005-08-08 08:45:11.000000000 +0100
+++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 2005-08-08 08:46:39.000000000 +0100
@@ -744,7 +744,7 @@
#ifndef SYSTEM_HSQLDB
Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $!
ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
#else
- Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $!
ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar file:///usr/share/java/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
+ Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar file:///usr/share/java/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilte!
r.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar file:///usr/share/java/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
#endif
End
diff -ru scripting.orig/java/build.xml scripting/java/build.xml
--- openoffice.org.orig/scripting/java/build.xml 2005-08-08 08:52:47.000000000 +0100
+++ openoffice.org/scripting/java/build.xml 2005-08-08 08:55:34.000000000 +0100
@@ -87,7 +87,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="/usr/share/java/bsh.jar"/>
<pathelement location="${solar.jar}/js.jar"/>
<pathelement location="${jardir}"/>
</path>
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 @@
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
+ 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
RES_ENUS TRUE
RES_GER TRUE
NO_REC_RES TRUE
openoffice.org-1.9.122.ooo52974.systemhsqldb.patch:
com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 0
config_office/configure.in | 22 ++++++++++++++++
config_office/set_soenv.in | 2 +
connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 9 +++++-
hsqldb/makefile.mk | 6 ++++
scp2/source/ooo/file_ooo.scp | 2 +
scp2/source/ooo/makefile.mk | 4 ++
scp2/source/ooo/profileitem_ooo.scp | 6 +++-
solenv/config/ssrc680.ini | 2 -
9 files changed, 50 insertions(+), 3 deletions(-)
--- NEW FILE openoffice.org-1.9.122.ooo52974.systemhsqldb.patch ---
diff -ru config_office.orig/configure.in config_office/configure.in
--- openoffice.org.orig/config_office/configure.in 2005-08-04 12:37:47.000000000 +0100
+++ openoffice.org/config_office/configure.in 2005-08-04 13:20:43.000000000 +0100
@@ -257,6 +257,9 @@
AC_ARG_WITH(system-xmlsec,
[ --with-system-xmlsec Use xmlsec1 already on system
],,)
+AC_ARG_WITH(system-hsqldb,
+[ --with-system-hsqldb Use hsqldb already on system
+],,)
AC_ARG_WITH(system-altlinuxhyph,
[ --with-system-altlinuxhyph Use ALTLinuxhyph already on system
],,)
@@ -3110,6 +3113,25 @@
AC_SUBST(NEON_CFLAGS)
dnl ===================================================================
+dnl Check for system hsqldb
+dnl ===================================================================
+AC_MSG_CHECKING([which hsqldb to use])
+if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
+ test "$with_system_hsqldb" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_HSQLDB=YES
+ HSQLDB_JAR=/usr/share/java/hsqldb.jar
+ AC_CHECK_FILE($HSQLDB_JAR, [],
+ [AC_MSG_ERROR(hsqldb.jar not found.)], [])
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_HSQLDB=NO
+ BUILD_TYPE="$BUILD_TYPE HSQLDB"
+fi
+AC_SUBST(SYSTEM_HSQLDB)
+AC_SUBST(HSQLDB_JAR)
+
+dnl ===================================================================
dnl Check for system xmlsec1
dnl ===================================================================
AC_MSG_CHECKING([which xmlsec1 to use])
diff -ru config_office.orig/set_soenv.in config_office/set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in 2005-08-04 12:37:47.000000000 +0100
+++ openoffice.org/config_office/set_soenv.in 2005-08-04 13:20:18.000000000 +0100
@@ -1761,6 +1761,8 @@
ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );
ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
ToFile( "SYSTEM_XMLSEC", "@SYSTEM_XMLSEC@", "e" );
+ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" );
+ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );
ToFile( "PAM_LINK", "@PAM_LINK@", "e" );
ToFile( "CRYPT_LINK", "@CRYPT_LINK@", "e" );
ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" );
Index: com/sun/star/sdbcx/comp/hsqldb/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk,v
retrieving revision 1.5
diff -u -p -r1.5 makefile.mk
--- openoffice.org.orig/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 15 Mar 2005 09:04:54 -0000 1.5
+++ openoffice.org/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 4 Aug 2005 14:57:40 -0000
@@ -70,7 +70,14 @@ TARGET = sdbc_hsqldb
# --- Files --------------------------------------------------------
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar hsqldb.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar
+
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
+.ELSE
+JARFILES+= hsqldb.jar
+.ENDIF
+
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
@@ -722,7 +722,9 @@
#endif
#ifdef SOLAR_JAVA
+#ifndef SYSTEM_HSQLDB
STD_JAR_FILE_PATCH( gid_File_Jar_Hsqldb, hsqldb )
+#endif
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif
diff -ru scp2.orig/source/ooo/makefile.mk scp2/source/ooo/makefile.mk
--- openoffice.org.orig/scp2/source/ooo/makefile.mk 2005-08-04 12:56:17.000000000 +0100
+++ openoffice.org/scp2/source/ooo/makefile.mk 2005-08-04 12:57:03.000000000 +0100
@@ -162,6 +162,10 @@
SCPDEFS+=-DSYSTEM_XMLSEC
.ENDIF
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+SCPDEFS+=-DSYSTEM_HSQLDB
+.ENDIF
+
SCPDEFS+=\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
diff -ru scp2.orig/source/ooo/profileitem_ooo.scp scp2/source/ooo/profileitem_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 2005-08-04 12:56:17.000000000 +0100
+++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 2005-08-04 15:55:45.000000000 +0100
@@ -741,6 +741,10 @@
Section = "Bootstrap";
Order = 7;
Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
- Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $!
ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
+#ifndef SYSTEM_HSQLDB
+ Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $!
ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
+#else
+ Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $!
ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar file:///usr/share/java/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
+#endif
End
--- openoffice.org.orig/solenv/config/ssrc680.ini 2005-08-04 12:50:37.000000000 +0100
+++ openoffice.org/solenv/config/ssrc680.ini 2005-08-04 12:51:28.000000000 +0100
@@ -113,7 +113,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 MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM
+ 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
RES_ENUS TRUE
RES_GER TRUE
NO_REC_RES TRUE
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- openoffice.org.spec 5 Aug 2005 20:20:24 -0000 1.374
+++ openoffice.org.spec 8 Aug 2005 08:06:48 -0000 1.375
@@ -1,5 +1,5 @@
%define ooo2ver 122
-%define ooo_rpm_release 4
+%define ooo_rpm_release 5
%define build_fc4 0
%define build_fc5 1
@@ -16,7 +16,7 @@
%define release_extension .1.0.fc4
%define internalxmlsec 1
%define internaldb 1
-%define internalhsqldb 1
+%define internaljavabits 1
%define includeemailmerge 0
%define cripplemenus 0
%define seperatebase 0
@@ -25,7 +25,7 @@
%define release_extension .2.0.fc5
%define internalxmlsec 0
%define internaldb 1
-%define internalhsqldb 0
+%define internaljavabits 0
%define includeemailmerge 1
%define cripplemenus 1
%define seperatebase 1
@@ -48,10 +48,10 @@
%else
%define xmlsecflags --with-system-xmlsec
%endif
-%if %{internalhsqldb}
-%define hsqldbflags --without-system-hsqldb
+%if %{internaljavabits}
+%define javabitsflags --without-system-hsqldb --without-system-beanshell
%else
-%define hsqldbflags --with-system-hsqldb
+%define javabitsflags --with-system-hsqldb --with-system-beanshell
%endif
%if %{internaldb}
%define dbflags --without-system-db
@@ -64,7 +64,7 @@
%define stlflags --without-stlport4
%endif
-%define extraflags %{hsqldbflags} %{xmlsecflags} %{dbflags} %{stlflags}
+%define extraflags %{javabitsflags} %{xmlsecflags} %{dbflags} %{stlflags}
%if %{includeexternals}
# Disable internal dependency generator while we include libxmlsec1 and
@@ -108,8 +108,8 @@
%if ! %{internalxmlsec}
BuildRequires: xmlsec1-nss-devel >= 1.2.8-2
%endif
-%if ! %{internalhsqldb}
-BuildRequires: hsqldb >= 1.80.1
+%if ! %{internaljavabits}
+BuildRequires: hsqldb >= 1.80.1, bsh >= 1.3.0
%endif
%if %{build_fc5}
BuildRequires: libgnomeprintui22-devel
@@ -180,9 +180,10 @@
Patch62: openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
Patch63: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
Patch64: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
-Patch65: openoffice.org-1.9.122.oooXXXXX.systemhsqldb.patch
-Patch66: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
-Patch67: openoffice.org-1.9.112.oooXXXXX.exception.package.patch
+Patch65: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
+Patch66: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
+Patch67: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
+Patch68: openoffice.org-1.9.112.oooXXXXX.exception.package.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -216,8 +217,8 @@
# rpm doesn't "do the right thing" if only the packages are Required.
Requires: libbluecurve.so, libcrux-engine.so
Requires: %{libgcj} >= 4.0.0
-%if ! %{internalhsqldb}
-Requires: hsqldb >= 1.80.1
+%if ! %{internaljavabits}
+Requires: hsqldb >= 1.80.1, bsh >= 1.3.0
%endif
PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
Obsoletes: openoffice.org
@@ -847,9 +848,12 @@
%patch62 -p1 -b .ooo52542.emptyrtfframes.sw.patch
%patch63 -p1 -b .oooXXXXX.parallel.solenv.patch
%patch64 -p1 -b .ooo52786.czech8bitdocimport.patch
-%patch65 -p1 -b .oooXXXXX.systemhsqldb.patch
-%patch66 -p1 -b .ooo52626.workspacerestore.vcl.patch
-%patch67 -p1 -b .oooXXXXX.exception.package.patch
+%patch65 -p1 -b .ooo52974.systemhsqldb.patch
+%patch66 -p1 -b .ooo52974.systembeanshell.patch
+%if %{internaljavabits}
+%patch67 -p1 -b .ooo52626.workspacerestore.vcl.patch
+%patch68 -p1 -b .oooXXXXX.exception.package.patch
+%endif
%if %{includeexternals}
#start ludicrous workaround
@@ -2008,13 +2012,13 @@
%dir %{instdir}/program/classes
%{instdir}/program/classes/agenda.jar
%{instdir}/program/classes/avmedia.jar
-%{instdir}/program/classes/bsh.jar
%{instdir}/program/classes/classes.jar
%{instdir}/program/classes/commonwizards.jar
%{instdir}/program/classes/docbook.jar
%{instdir}/program/classes/fax.jar
%{instdir}/program/classes/form.jar
-%if %{internalhsqldb}
+%if %{internaljavabits}
+%{instdir}/program/classes/bsh.jar
%{instdir}/program/classes/hsqldb.jar
%endif
%{instdir}/program/classes/htmlsoff.jar
@@ -3097,6 +3101,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Mon Aug 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.122-5
+- use system bsh
+
* Fri Aug 05 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.122-4
- session management and workspace restore corrections
- add openoffice.org-1.9.112.oooXXXXX.exception.package.patch for rh#165197#
--- openoffice.org-1.9.122.oooXXXXX.systemhsqldb.patch DELETED ---
- Previous message (by thread): rpms/kernel/devel patch-2.6.13-rc6.bz2.sign, NONE, 1.1 .cvsignore, 1.190, 1.191 kernel-2.6.spec, 1.1455, 1.1456 sources, 1.146, 1.147 upstream, 1.122, 1.123 patch-2.6.13-rc5.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/gnutls/devel gnutls.spec,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list