rpms/openoffice.org/devel openoffice.org-1.9.122.oooXXXXX.systemxalan.patch, NONE, 1.1 openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.12, 1.13 openoffice.org.spec, 1.558, 1.559
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Nov 23 09:49:58 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30765
Modified Files:
openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
openoffice.org.spec
Added Files:
openoffice.org-1.9.122.oooXXXXX.systemxalan.patch
Log Message:
try and get this system java component stuff upstreamable
openoffice.org-1.9.122.oooXXXXX.systemxalan.patch:
filter/source/config/fragments/makefile.mk | 4 ++++
scp2/source/ooo/profileitem_ooo.scp | 2 +-
source/config/fragments/makefile.mk | 0
source/xmerge/build.xml | 0
xmerge/source/xmerge/build.xml | 5 ++---
5 files changed, 7 insertions(+), 4 deletions(-)
--- NEW FILE openoffice.org-1.9.122.oooXXXXX.systemxalan.patch ---
Index: source/xmerge/build.xml
===================================================================
RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v
retrieving revision 1.2
diff -u -p -u -r1.2 build.xml
--- openoffice.org.orig/xmerge/source/xmerge/build.xml 24 Oct 2005 17:57:33 -0000 1.2
+++ openoffice.org/xmerge/source/xmerge/build.xml 5 Nov 2005 19:24:16 -0000
@@ -58,9 +58,8 @@
<property file="../inc/antbuild.properties"/>
<path id="classpath">
- <pathelement location="${solar.jar}/parser.jar"/>
- <pathelement location="${solar.jar}/jaxp.jar"/>
- <pathelement location="${solar.jar}/xerces.jar"/>
+ <pathelement location="/usr/share/java/xerces-j2.jar"/>
+ <pathelement location="/usr/share/java/xalan-j2.jar"/>
<pathelement location="${solar.jar}/unoil.jar"/>
<pathelement location="${solar.jar}/ridl.jar"/>
<pathelement location="${solar.jar}/jurt.jar"/>
Index: source/config/fragments/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
retrieving revision 1.14
diff -u -p -u -r1.14 makefile.mk
--- openoffice.org.orig/filter/source/config/fragments/makefile.mk 25 Oct 2005 11:56:16 -0000 1.14
+++ openoffice.org/filter/source/config/fragments/makefile.mk 7 Nov 2005 13:46:28 -0000
@@ -149,7 +149,11 @@ ALLTAR: \
MERGE:=python ../tools/merge/pyAltFCFGMerge
.ELSE
MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+.IF "$(SYSTEM_XALAN)"="YES"
+PACKLANG := $(JAVAI) $(JAVACPS) /usr/share/java/xalan-j2.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+.ELSE
PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+.ENDIF
.ENDIF
# -----------------------------------------------------------------------------
--- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 2005-11-23 04:44:17.000000000 -0500
+++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 2005-11-23 04:45:22.000000000 -0500
@@ -758,5 +758,5 @@
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 BSH_JAR $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.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/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/act!
ivation.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 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 BSH_JAR $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.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/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/act!
ivation.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 HSQLDB_JAR $ORIGIN/classes/sdbc_hsqldb.jar file:///usr/share/java/xerces-j2.jar file:///usr/share/java/xalan-j2.jar file:///usr/share/java/xml-commons-apis-1.0.jar;
End
openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch:
beanshell/makefile.mk | 7 +
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
hsqldb/makefile.mk | 6 +
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
19 files changed, 123 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 7 Nov 2005 13:52:43 -0000 1.12
+++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 23 Nov 2005 09:49:56 -0000 1.13
@@ -1,30 +1,85 @@
-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
- ],,)
+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
+retrieving revision 1.139.16.1
+diff -u -r1.139.16.1 configure.in
+--- openoffice.org.orig/config_office/configure.in 22 Nov 2005 10:15:13 -0000 1.139.16.1
++++ openoffice.org/config_office/configure.in 22 Nov 2005 15:43:38 -0000
+@@ -236,6 +236,20 @@
+ [ --with-db-jar=JARFILE Specify path to jarfile manually ],
+ [ DB_JAR="$withval"
+ ])
+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
++AC_ARG_WITH(hsqldb-jar,
++[ --with-hsqldb-jar=JARFILE Specify path to jarfile manually ],
++[ HSQLDB_JAR="$withval"
++])
++AC_ARG_WITH(system-beanshell,
++[ --with-system-beanshell Use beanshell already on system
++],,)
++AC_ARG_WITH(beanshell-jar,
++[ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
++[ BSH_JAR="$withval"
++])
+ AC_ARG_WITH(system-sablot,
+ [ --with-system-sablot Use sablot already on system
],,)
-@@ -3110,6 +3113,25 @@
- AC_SUBST(NEON_CFLAGS)
-
- dnl ===================================================================
+@@ -2643,6 +2657,63 @@
+ AC_SUBST(DB_VERSION)
+ AC_SUBST(DB_INCLUDES)
+ AC_SUBST(DB_JAR)
++
++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
++ test "$with_system_hsqldb" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_HSQLDB=YES
-+ HSQLDB_JAR=/usr/share/java/hsqldb.jar
++ if test -z $HSQLDB_JAR; then
++ HSQLDB_JAR=/usr/share/java/hsqldb.jar
++ fi
+ AC_CHECK_FILE($HSQLDB_JAR, [],
-+ [AC_MSG_ERROR(hsqldb.jar not found.)], [])
++ [AC_MSG_ERROR(hsqldb.jar not found.)], [])
++ AC_MSG_CHECKING([whether hsqldb is >= 1.8.0])
++ export HSQLDB_JAR
++ if $PERL -e 'use Archive::Zip;
++ my $file = "$ENV{'HSQLDB_JAR'}";
++ my $zip = Archive::Zip->new( $file );
++ my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
++ if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
++ exit 0;
++ } else {
++ exit 1;
++ }'; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_ERROR([no, hsqldb >= 1.8.0 is needed])
++ fi
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_HSQLDB=NO
@@ -34,126 +89,108 @@
+AC_SUBST(HSQLDB_JAR)
+
+dnl ===================================================================
- dnl Check for system xmlsec1
++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
++ if test -z $BSH_JAR; then
++ BSH_JAR=/usr/share/java/bsh.jar
++ fi
++ 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 ===================================================================
- 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" );
+ dnl Check for system sablot
+Index: set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.78.14.1
+diff -u -r1.78.14.1 set_soenv.in
+--- openoffice.org.orig/config_office/set_soenv.in 22 Nov 2005 10:15:14 -0000 1.78.14.1
++++ openoffice.org/config_office/set_soenv.in 22 Nov 2005 15:43:40 -0000
+@@ -1764,6 +1764,10 @@
+ ToFile( "DB_VERSION", "@DB_VERSION@", "e" );
+ ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
+ ToFile( "DB_JAR", "@DB_JAR@", "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" );
++ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" );
++ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
+ ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" );
+ ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" );
+ ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","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
+retrieving revision 1.6
+diff -u -r1.6 makefile.mk
+--- openoffice.org.orig/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 8 Sep 2005 04:56:11 -0000 1.6
++++ openoffice.org/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk 22 Nov 2005 16:19:14 -0000
+@@ -43,7 +43,12 @@
# --- 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\
-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
+Index: prj/build.lst
+===================================================================
+RCS file: /cvs/dba/connectivity/prj/build.lst,v
+retrieving revision 1.25
+diff -u -r1.25 build.lst
+--- openoffice.org.orig/connectivity/prj/build.lst 30 Aug 2005 09:32:36 -0000 1.25
++++ openoffice.org/connectivity/prj/build.lst 22 Nov 2005 16:19:14 -0000
+@@ -1,4 +1,4 @@
+-cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper hsqldb NULL
++cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper HSQLDB:hsqldb NULL
+ 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"
-+SCPDEFS+=-DSYSTEM_HSQLDB
++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
+
- SCPDEFS+=\
- -DICU_MAJOR=$(ICU_MAJOR) \
- -DICU_MINOR=$(ICU_MINOR) \
-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)
+ .IF "$(SOLAR_JAVA)" != ""
+ # --- Files --------------------------------------------------------
- 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 @@
+Index: source/ooo/file_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
+retrieving revision 1.127
+diff -u -r1.127 file_ooo.scp
+--- openoffice.org.orig/scp2/source/ooo/file_ooo.scp 16 Nov 2005 10:20:12 -0000 1.127
++++ openoffice.org/scp2/source/ooo/file_ooo.scp 22 Nov 2005 16:16:55 -0000
+@@ -631,9 +631,9 @@
#endif
#ifdef SOLAR_JAVA
@@ -165,101 +202,118 @@
#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
+@@ -729,9 +729,11 @@
+ #endif
+
+ #ifdef SOLAR_JAVA
++#ifndef SYSTEM_HSQLDB
+ STD_JAR_FILE_PATCH( gid_File_Jar_Hsqldb, hsqldb )
+ STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
+ #endif
++#endif
+
+ #ifdef SOLAR_JAVA
+ File gid_File_Jar_Commonwizards
+Index: source/ooo/makefile.mk
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v
+retrieving revision 1.35
+diff -u -r1.35 makefile.mk
+--- openoffice.org.orig/scp2/source/ooo/makefile.mk 28 Sep 2005 15:47:30 -0000 1.35
++++ openoffice.org/scp2/source/ooo/makefile.mk 22 Nov 2005 16:17:08 -0000
+@@ -135,8 +135,21 @@
+ SCPDEFS+=-DSYSTEM_MYSPELL
.ENDIF
+.IF "$(SYSTEM_BSH)" == "YES"
-+SCPDEFS+=-DSYSTEM_BSH
++SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=file://$(BSH_JAR)
++.ELSE
++SCPDEFS+=-DBSH_JAR=$ORIGIN/classes/bsh.jar
+.ENDIF
+
++.IF "$(SYSTEM_HSQLDB)" == "YES"
++SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=file://$(HSQLDB_JAR)
++.ELSE
++SCPDEFS+=-DHSQLDB_JAR=$ORIGIN/classes/hsqldb.jar
++.ENDIF
++
+ .IF "$(SYSTEM_XALAN)" == "YES"
+-SCPDEFS+=-DSYSTEM_XALAN
++SCPDEFS+=DSYSTEM_XALAN
++#SCPDEFS+=DSYSTEM_XALAN -DXALAN_JAR=$(XALAN_JAR)
+ .ENDIF
+
SCPDEFS+=\
- -DICU_MAJOR=$(ICU_MAJOR) \
- -DICU_MINOR=$(ICU_MINOR) \
-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,8 @@
+Index: source/ooo/profileitem_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/profileitem_ooo.scp,v
+retrieving revision 1.28
+diff -u -r1.28 profileitem_ooo.scp
+--- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 11 Nov 2005 12:27:37 -0000 1.28
++++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 22 Nov 2005 16:17:08 -0000
+@@ -758,6 +758,5 @@
+ 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/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/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";
++ 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 BSH_JAR $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.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/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/ac!
tivation.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 HSQLDB_JAR $ORIGIN/classes/sdbc_hsqldb.jar;
+ End
+-
+Index: java/build.xml
+===================================================================
+RCS file: /cvs/framework/scripting/java/build.xml,v
+retrieving revision 1.32
+diff -u -r1.32 build.xml
+--- openoffice.org.orig/scripting/java/build.xml 9 Sep 2005 01:54:21 -0000 1.32
++++ openoffice.org/scripting/java/build.xml 22 Nov 2005 16:58:02 -0000
+@@ -50,6 +50,12 @@
+ Not needed in default build -->
+ <property name="netbeans.install.path" value="/export/home/netbeans"/>
+
++ <property environment="env"/>
++ <property name="bshjar" value="${solar.jar}/bsh.jar"/>
++ <condition property="bshjar" value="${env.SYSTEM_BSH}">
++ <isset property='${env.BSH_JAR}'/>
++ </condition>
++
+ <!-- ==================== classpath setting ============================ -->
+ <path id="idlclasspath">
+ <pathelement location="${solar.jar}/jurt.jar"/>
+@@ -58,7 +64,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}/bsh.jar"/>
++ <pathelement location="${bshjar}"/>
<pathelement location="${solar.jar}/js.jar"/>
<pathelement location="${jardir}"/>
</path>
---- openoffice.org.orig/scripting/prj/build.lst 2005-09-09 09:29:54.000000000 +0100
-+++ openoffice.org/scripting/prj/build.lst 2005-09-09 09:30:02.000000000 +0100
+Index: prj/build.lst
+===================================================================
+RCS file: /cvs/framework/scripting/prj/build.lst,v
+retrieving revision 1.13
+diff -u -r1.13 build.lst
+--- openoffice.org.orig/scripting/prj/build.lst 11 Oct 2004 13:31:56 -0000 1.13
++++ openoffice.org/scripting/prj/build.lst 22 Nov 2005 16:58:14 -0000
@@ -1,4 +1,4 @@
-tc scripting : bridges rdbmaker vcl xmlscript basic sfx2 rhino beanshell javaunohelper NULL
+tc scripting : bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
tc scripting usr1 - all tc_mkout NULL
tc scripting\source\provider nmake - all tc_scriptingprovider NULL
tc scripting\source\basprov nmake - all tc_scriptingbasprov NULL
---- openoffice.org.orig/connectivity/prj/build.lst 2005-09-09 09:31:18.000000000 +0100
-+++ openoffice.org/connectivity/prj/build.lst 2005-09-09 09:32:05.000000000 +0100
-@@ -1,4 +1,4 @@
--cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper hsqldb NULL
-+cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper HSQLDB:hsqldb NULL
- 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: profileitem_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/profileitem_ooo.scp,v
-retrieving revision 1.27
-diff -u -p -r1.27 profileitem_ooo.scp
---- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 24 Oct 2005 18:31:12 -0000 1.27
-+++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 5 Nov 2005 13:25:29 -0000
-@@ -740,6 +740,10 @@ ProfileItem gid_Profileitem_Jvmfwk_Uno_J
- Section = "Bootstrap";
- Order = 7;
- Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
-+#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/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/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 file:///usr/share/java/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.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/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/x!
t.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 file:///usr/share/java/xerces-j2.jar file:///usr/share/java/xalan-j2.jar file:///usr/share/java/xml-commons-apis-1.0.jar";
-+#endif
- End
-
-Index: source/xmerge/build.xml
+Index: config/ssrc680.ini
===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 build.xml
---- openoffice.org.orig/xmerge/source/xmerge/build.xml 24 Oct 2005 17:57:33 -0000 1.2
-+++ openoffice.org/xmerge/source/xmerge/build.xml 5 Nov 2005 19:24:16 -0000
-@@ -58,9 +58,8 @@
- <property file="../inc/antbuild.properties"/>
-
- <path id="classpath">
-- <pathelement location="${solar.jar}/parser.jar"/>
-- <pathelement location="${solar.jar}/jaxp.jar"/>
-- <pathelement location="${solar.jar}/xerces.jar"/>
-+ <pathelement location="/usr/share/java/xerces-j2.jar"/>
-+ <pathelement location="/usr/share/java/xalan-j2.jar"/>
- <pathelement location="${solar.jar}/unoil.jar"/>
- <pathelement location="${solar.jar}/ridl.jar"/>
- <pathelement location="${solar.jar}/jurt.jar"/>
-Index: source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.14
-diff -u -p -u -r1.14 makefile.mk
---- openoffice.org.orig/filter/source/config/fragments/makefile.mk 25 Oct 2005 11:56:16 -0000 1.14
-+++ openoffice.org/filter/source/config/fragments/makefile.mk 7 Nov 2005 13:46:28 -0000
-@@ -149,7 +149,11 @@ ALLTAR: \
- MERGE:=python ../tools/merge/pyAltFCFGMerge
- .ELSE
- MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
-+.IF "$(SYSTEM_XALAN)"="YES"
-+PACKLANG := $(JAVAI) $(JAVACPS) /usr/share/java/xalan-j2.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+.ELSE
- PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+.ENDIF
- .ENDIF
-
- # -----------------------------------------------------------------------------
+RCS file: /cvs/tools/solenv/config/ssrc680.ini,v
+retrieving revision 1.83
+diff -u -r1.83 ssrc680.ini
+--- openoffice.org.orig/solenv/config/ssrc680.ini 28 Oct 2005 15:04:11 -0000 1.83
++++ openoffice.org/solenv/config/ssrc680.ini 22 Nov 2005 15:48:09 -0000
+@@ -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 MOZ NAS NEON PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN
++ BUILD_TYPE SO OOo EXT BSH 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 MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN
+ 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.558
retrieving revision 1.559
diff -u -r1.558 -r1.559
--- openoffice.org.spec 21 Nov 2005 16:32:25 -0000 1.558
+++ openoffice.org.spec 23 Nov 2005 09:49:56 -0000 1.559
@@ -1,6 +1,6 @@
%define oootag SRC680
%define ooomilestone 141
-%define rh_rpm_release 1
+%define rh_rpm_release 1.cmc
%define build_fc5 1
%define build_fc4 0
More information about the fedora-cvs-commits
mailing list