rpms/openoffice.org/devel openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch, NONE, 1.1 openoffice.org.spec, 1.1603, 1.1604

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5184

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch 
Log Message:
lucene omission

openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch:

--- NEW FILE openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch ---
--- OOO300_m1.orig/helpcontent2/settings.pmk	2008-08-05 18:54:10.000000000 +0100
+++ OOO300_m1/helpcontent2/settings.pmk	2008-08-05 18:54:36.000000000 +0100
@@ -2,7 +2,7 @@
 
 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)
+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
 .ELSE
 my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
 .ENDIF


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1603
retrieving revision 1.1604
diff -u -r1.1603 -r1.1604
--- openoffice.org.spec	5 Aug 2008 15:36:14 -0000	1.1603
+++ openoffice.org.spec	5 Aug 2008 17:55:27 -0000	1.1604
@@ -107,6 +107,7 @@
 Patch35: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
 Patch36: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 Patch37: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
+Patch38: openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1258,6 +1259,7 @@
 %patch35 -p1 -b .ooo91977.sd.holdreference.patch
 %patch36 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
 %patch37 -p1 -b .ooo92253.dbaccess.a11y.crash
+%patch38 -p1 -b .oooXXXXX.helpcontent2.fixlucene.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1367,7 +1369,7 @@
 cd instsetoo_native/util
 #get an unpackaged raw install
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
-export CLASSPATH=/usr/share/java/lucene.jar
+export CLASSPATH=/usr/share/java/lucene.jar:/usr/share/java/lucene-contrib/lucene-analyzers.jar
 %if %{langpacks}
 for attempt in 1 2 3 4 5 6 7 8 9 10; do
     echo Attempt $attempt