rpms/openoffice.org/devel openoffice.org-1.9.122.oooXXXXX.systemhsqldb.patch, NONE, 1.1 openoffice.org.spec, 1.370, 1.371
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 4 18:24:20 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18286
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.122.oooXXXXX.systemhsqldb.patch
Log Message:
system hsqldb
openoffice.org-1.9.122.oooXXXXX.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.oooXXXXX.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.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- openoffice.org.spec 4 Aug 2005 11:34:21 -0000 1.370
+++ openoffice.org.spec 4 Aug 2005 18:24:17 -0000 1.371
@@ -16,6 +16,7 @@
%define release_extension .1.0.fc4
%define internalxmlsec 1
%define internaldb 1
+%define internalhsqldb 1
%define includeemailmerge 0
%define cripplemenus 0
%define seperatebase 0
@@ -24,6 +25,7 @@
%define release_extension .2.0.fc5
%define internalxmlsec 0
%define internaldb 1
+%define internalhsqldb 0
%define includeemailmerge 1
%define cripplemenus 1
%define seperatebase 1
@@ -46,6 +48,11 @@
%else
%define xmlsecflags --with-system-xmlsec
%endif
+%if %{internalhsqldb}
+%define hsqldbflags --without-system-hsqldb
+%else
+%define hsqldbflags --with-system-hsqldb
+%endif
%if %{internaldb}
%define dbflags --without-system-db
%else
@@ -57,7 +64,7 @@
%define stlflags --without-stlport4
%endif
-%define extraflags %{xmlsecflags} %{dbflags} %{stlflags}
+%define extraflags %{hsqldbflags} %{xmlsecflags} %{dbflags} %{stlflags}
%if %{includeexternals}
# Disable internal dependency generator while we include libxmlsec1 and
@@ -89,19 +96,21 @@
Source5: gcj-sed.sh
BuildRequires: tcsh, perl, sed, zip, bzip2, unzip, tar, findutils
BuildRequires: autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
-BuildRequires: gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils
+BuildRequires: gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
BuildRequires: %{gccjava} >= 4.0.0, %{libgcjdevel} >= 4.0.0
-BuildRequires: java-1.4.2-gcj-compat-devel
-BuildRequires: zlib-devel, freetype-devel
+BuildRequires: java-1.4.2-gcj-compat-devel, zlib-devel, freetype-devel
BuildRequires: gtk2-devel >= 2.4.8, gnome-vfs2-devel, cups-devel, curl-devel
BuildRequires: boost-devel >= 1.31.0, python-devel, mozilla-devel >= 1.7.5
BuildRequires: expat-devel, libxml2-devel, openldap-devel, neon-devel >= 0.24
BuildRequires: libidn-devel, startup-notification-devel, libwpd-devel >= 0.8.0
BuildRequires: desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, prelink
-BuildRequires: perl-Archive-Zip, evolution-data-server-devel, libxslt >= 1.1.14
+BuildRequires: evolution-data-server-devel, libxslt >= 1.1.14
%if ! %{internalxmlsec}
BuildRequires: xmlsec1-nss-devel >= 1.2.8-2
%endif
+%if ! %{internalhsqldb}
+BuildRequires: hsqldb >= 1.80.1
+%endif
%if %{build_fc5}
BuildRequires: libgnomeprintui22-devel
%endif
@@ -172,6 +181,7 @@
Patch63: openoffice.org-1.9.122.ooo52626.SM.vcl.patch
Patch64: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
Patch65: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
+Patch66: openoffice.org-1.9.122.oooXXXXX.systemhsqldb.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -205,6 +215,9 @@
# 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
+%endif
PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
Obsoletes: openoffice.org
Obsoletes: openoffice.org-libs
@@ -834,6 +847,7 @@
%patch63 -p1 -b .ooo52626.SM.vcl.patch
%patch64 -p1 -b .oooXXXXX.parallel.solenv.patch
%patch65 -p1 -b .ooo52786.czech8bitdocimport.patch
+%patch66 -p1 -b .oooXXXXX.systemhsqldb.patch
%if %{includeexternals}
#start ludicrous workaround
@@ -1998,7 +2012,9 @@
%{instdir}/program/classes/docbook.jar
%{instdir}/program/classes/fax.jar
%{instdir}/program/classes/form.jar
+%if %{internalhsqldb}
%{instdir}/program/classes/hsqldb.jar
+%endif
%{instdir}/program/classes/htmlsoff.jar
%{instdir}/program/classes/java_uno.jar
%{instdir}/program/classes/java_uno_accessbridge.jar
@@ -3082,6 +3098,8 @@
* Wed Aug 03 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.122-3
- ooo#52626# sessionmanagement and vclplug problem
- ooo#52786# czech 8bit msword doc import problem
+- disable internal hsqldb 1.80.1 and use the rawhide system one now
+ that it has been bumped to that version
* Tue Aug 02 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.122-1
- next version
More information about the fedora-cvs-commits
mailing list