rpms/openoffice.org/devel openoffice.org.spec,1.2173,1.2174

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#573239 fix java xslt problems


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2173
retrieving revision 1.2174
diff -u -p -r1.2173 -r1.2174
--- openoffice.org.spec	15 Mar 2010 14:08:52 -0000	1.2173
+++ openoffice.org.spec	15 Mar 2010 14:14:07 -0000	1.2174
@@ -62,7 +62,7 @@ BuildRequires:  db4-devel, sane-backends
 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, saxon, hsqldb, bsh, lucene, lucene-contrib
+BuildRequires:  lpsolve-devel, hsqldb, bsh, lucene, lucene-contrib
 BuildRequires:  mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp
 BuildRequires:  jakarta-commons-codec, jakarta-commons-httpclient
 BuildRequires:  jakarta-commons-lang, poppler-devel, fontpackages-devel
@@ -175,7 +175,7 @@ Requires: %{name}-ure = %{epoch}:%{versi
 Requires: liberation-sans-fonts >= 1.0, liberation-serif-fonts >= 1.0, liberation-mono-fonts >= 1.0
 Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: hunspell-en, hyphen-en, hyphen >= 2.4, autocorr-en
-Requires: saxon, lucene
+Requires: lucene
 Requires(pre):    gtk2 >= 2.9.4
 Requires(post):   gtk2 >= 2.9.4
 Requires(preun):  gtk2 >= 2.9.4
@@ -1715,7 +1715,7 @@ autoconf
  --with-system-apache-commons \
  --with-external-dict-dir=/usr/share/myspell --without-myspell-dicts \
  --without-system-mspack --without-fonts --without-agg --without-ppds  \
- --without-afms %{stlflags} --with-lang="%{langpack_langs}" \
+ --without-afms %{stlflags} --with-lang="%{langpack_langs}" --without-system-saxon \
  --with-poor-help-localizations="$POORHELPS" \
  --disable-graphite # for now
 
@@ -2496,6 +2496,7 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/classes/LuceneHelpWrapper.jar
 %{basisinstdir}/program/classes/officebean.jar
 %{basisinstdir}/program/classes/report.jar
+%{basisinstdir}/program/classes/saxon9.jar
 %{basisinstdir}/program/classes/ScriptFramework.jar
 %{basisinstdir}/program/classes/ScriptProviderForJava.jar
 %{basisinstdir}/program/classes/table.jar
@@ -4173,6 +4174,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar 15 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.12
+- Resolves: rhbz#573239 fix java xslt problems
+
 * Tue Mar 09 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.13
 - Related: rhbz#571505, *groan*, typo