rpms/openoffice.org/devel openoffice.org.spec,1.1666,1.1667

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4912

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#465664 need lucene for runtime help search


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1666
retrieving revision 1.1667
diff -u -r1.1666 -r1.1667
--- openoffice.org.spec	4 Oct 2008 13:18:40 -0000	1.1666
+++ openoffice.org.spec	6 Oct 2008 08:39:56 -0000	1.1667
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 9
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -147,7 +147,7 @@
 Group: Applications/Productivity
 Requires: liberation-fonts >= 1.00
 Requires: hunspell-en, hyphen-en
-Requires: saxon
+Requires: saxon, lucene
 PreReq: gtk2 >= 2.9.4
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
@@ -2003,8 +2003,9 @@
 cp -r psprint_config/configuration/ppds/SGENPRT.PS $RPM_BUILD_ROOT/%{basisinstdir}/share/psprint/driver/SGENPRT.PS
 %endif
 
-# rhbz#452385
-sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{basisinstdir}/program/fundamentalbasisrc
+# rhbz#452385 to auto have postgres in classpath if subsequently installed
+# rhbz#465664 to get lucene working for functional help
+sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/lucene.jar file:///usr/share/java/lucene-contrib/lucene-analyzers.jar file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{basisinstdir}/program/fundamentalbasisrc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -3681,6 +3682,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Oct 06 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.3
+- Resolves: rhbz#465664 need lucene for runtime help search
+
 * Sat Oct 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.2
 - Resolves: rhbz#465427 wrong order of seds
 - Resolves: rhbz#465515 use --force to avoid any potential problems where