rpms/openoffice.org/devel workspace.ab55.patch, NONE, 1.1 openoffice.org.spec, 1.1550, 1.1551
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Jul 3 13:32:57 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26721
Modified Files:
openoffice.org.spec
Added Files:
workspace.ab55.patch
Log Message:
lucene required to build now
workspace.ab55.patch:
--- NEW FILE workspace.ab55.patch ---
Index: tools/config_office/configure.in
diff -u tools/config_office/configure.in:1.272 tools/config_office/configure.in:1.272.2.1
--- tools/config_office/configure.in:1.272 Tue Jun 24 04:59:33 2008
+++ tools/config_office/configure.in Wed Jul 2 05:57:03 2008
@@ -339,6 +339,13 @@
AC_ARG_WITH(system-db,
[ --with-system-db Use berkeley db already on system
],,)
+AC_ARG_WITH(system-lucene,
+[ --with-system-lucene Use lucene already on system
+],,)
+AC_ARG_WITH(lucene-core-jar,
+[ --with-lucene-core-jar=JARFILE Specify path to jarfile manually ],
+[ LUCENE_CORE_JAR="$withval"
+])
AC_ARG_WITH(system-hsqldb,
[ --with-system-hsqldb Use hsqldb already on system
],,)
@@ -3660,6 +3667,27 @@
AC_SUBST(DB_JAR)
dnl ===================================================================
+dnl Check for system lucene
+dnl ===================================================================
+AC_MSG_CHECKING([which lucene to use])
+if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
+ test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_LUCENE=YES
+ if test -z $LUCENE_CORE_JAR; then
+ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
+ fi
+ AC_CHECK_FILE($LUCENE_CORE_JAR, [],
+ [AC_MSG_ERROR(lucene-core.jar not found.)], [])
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_LUCENE=NO
+ BUILD_TYPE="$BUILD_TYPE LUCENE"
+fi
+AC_SUBST(SYSTEM_LUCENE)
+AC_SUBST(LUCENE_CORE_JAR)
+
+dnl ===================================================================
dnl Check for system hsqldb
dnl ===================================================================
AC_MSG_CHECKING([which hsqldb to use])
Index: tools/config_office/set_soenv.in
diff -u tools/config_office/set_soenv.in:1.190 tools/config_office/set_soenv.in:1.190.8.1
--- tools/config_office/set_soenv.in:1.190 Fri Jun 13 07:11:11 2008
+++ tools/config_office/set_soenv.in Wed Jul 2 05:57:05 2008
@@ -1969,6 +1969,8 @@
ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" );
ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );
+ToFile( "SYSTEM_LUCENE", "@SYSTEM_LUCENE@", "e" );
+ToFile( "LUCENE_CORE_JAR", "@LUCENE_CORE_JAR@", "e" );
ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" );
ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
ToFile( "SYSTEM_XML_APIS", "@SYSTEM_XML_APIS@", "e" );
Index: tools/solenv/config/sdev300.ini
diff -u tools/solenv/config/sdev300.ini:1.35 tools/solenv/config/sdev300.ini:1.35.4.1
--- tools/solenv/config/sdev300.ini:1.35 Thu Jun 26 04:21:33 2008
+++ tools/solenv/config/sdev300.ini Wed Jul 2 06:35:03 2008
@@ -91,7 +91,7 @@
{
BIG_SVX TRUE
BMP_WRITES_FLAG TRUE
- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF
+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF LUCENE
RES_ENUS TRUE
RES_GER TRUE
NO_REC_RES TRUE
Index: documentation/helpcontent2/settings.pmk
diff -u documentation/helpcontent2/settings.pmk:1.10 documentation/helpcontent2/settings.pmk:1.10.2.1
--- documentation/helpcontent2/settings.pmk:1.10 Tue Jun 24 09:16:09 2008
+++ documentation/helpcontent2/settings.pmk Wed Jul 2 05:48:08 2008
@@ -1,6 +1,11 @@
.INCLUDE : $(INCCOM)$/aux_langs.mk
-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
+.IF "$(SYSTEM_LUCENE)" == "YES"
+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
+.ELSE
+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
+.ENDIF
.IF "$(SYSTEM_DB)" != "YES"
JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
Index: installation/scp2/source/ooo/file_ooo.scp
diff -u installation/scp2/source/ooo/file_ooo.scp:1.249 installation/scp2/source/ooo/file_ooo.scp:1.249.2.1
--- installation/scp2/source/ooo/file_ooo.scp:1.249 Tue Jun 24 09:25:44 2008
+++ installation/scp2/source/ooo/file_ooo.scp Wed Jul 2 06:01:45 2008
@@ -476,8 +476,10 @@
#endif
#ifdef SOLAR_JAVA
+#ifndef SYSTEM_LUCENE
STD_JAR_FILE( gid_File_Jar_Lucene, lucene-core-2.3 )
#endif
+#endif
#ifdef SOLAR_JAVA
UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
Index: installation/scp2/source/ooo/makefile.mk
diff -u installation/scp2/source/ooo/makefile.mk:1.69 installation/scp2/source/ooo/makefile.mk:1.69.50.1
--- installation/scp2/source/ooo/makefile.mk:1.69 Mon Jun 9 05:51:56 2008
+++ installation/scp2/source/ooo/makefile.mk Wed Jul 2 06:01:46 2008
@@ -179,6 +179,10 @@
SCPDEFS+=-DENABLE_CAIRO
.ENDIF
+.IF "$(SYSTEM_LUCENE)" == "YES"
+SCPDEFS+=-DSYSTEM_LUCENE
+.ENDIF
+
.IF "$(SYSTEM_ICU)" == "YES"
SCPDEFS+=-DSYSTEM_ICU
.ELSE
Index: util/xmlhelp/prj/build.lst
diff -u util/xmlhelp/prj/build.lst:1.17 util/xmlhelp/prj/build.lst:1.17.2.1
--- util/xmlhelp/prj/build.lst:1.17 Tue Jun 24 09:17:30 2008
+++ util/xmlhelp/prj/build.lst Wed Jul 2 06:12:01 2008
@@ -1,4 +1,4 @@
-xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools lucene NULL
+xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene NULL
xh xmlhelp usr1 - all xh_mkout NULL
xh xmlhelp\inc nmake - all xh_inc NULL
xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL
Index: util/xmlhelp/source/com/sun/star/help/makefile.mk
diff -u util/xmlhelp/source/com/sun/star/help/makefile.mk:1.36 util/xmlhelp/source/com/sun/star/help/makefile.mk:1.36.2.1
--- util/xmlhelp/source/com/sun/star/help/makefile.mk:1.36 Tue Jun 24 09:19:16 2008
+++ util/xmlhelp/source/com/sun/star/help/makefile.mk Wed Jul 2 06:12:02 2008
@@ -100,7 +100,12 @@
$(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class \
$(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class
-JARFILES = lucene-core-2.3.jar ridl.jar jurt.jar unoil.jar juh.jar
+JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
+.IF "$(SYSTEM_LUCENE)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
+.ELSE
+JARFILES += lucene-core-2.3.jar
+.ENDIF
JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
JARTARGET = LuceneHelpWrapper.jar
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1550
retrieving revision 1.1551
diff -u -r1.1550 -r1.1551
--- openoffice.org.spec 2 Jul 2008 14:25:19 -0000 1.1550
+++ openoffice.org.spec 3 Jul 2008 13:32:07 -0000 1.1551
@@ -60,7 +60,7 @@
BuildRequires: freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel
BuildRequires: evolution-data-server-devel, libtextcat-devel, nss-devel
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel
-BuildRequires: lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh
+BuildRequires: lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh, lucene
BuildRequires: mesa-libGLU-devel, ant, ant-apache-regexp
BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient
BuildRequires: jakarta-commons-lang
@@ -120,6 +120,7 @@
Patch50: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
Patch51: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
Patch52: workspace.cairo06.patch
+Patch53: workspace.ab55.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1265,6 +1266,7 @@
%patch50 -p1 -b .ooo90876.connectivity.evoab2.patch
%patch51 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
%patch52 -p1 -b .workspace.cairo06.patch
+%patch53 -p1 -b .workspace.ab55.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1282,6 +1284,7 @@
--with-vba-package-format="builtin" --enable-dbus --with-system-libs \
--with-system-headers --with-system-apache-commons \
--with-commons-logging-jar=/usr/share/java/commons-logging.jar \
+ --with-lucene-core-jar=/usr/share/java/lucene.jar \
--with-system-mozilla --with-system-libtextcat --with-system-dicts \
--with-dict-path=/usr/share/myspell --without-myspell-dicts \
--without-system-mspack --without-fonts --without-gpc --without-agg \
@@ -3483,6 +3486,7 @@
- drop integrated pseudoworkspace.valgrind1.patch
- drop integrated openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
- add workspace.cairo06.patch
+- add workspace.ab55.patch
- Resolves: rhbz#453487 some font packages now gone
* Thu Jun 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.20-1
More information about the fedora-extras-commits
mailing list