rpms/openoffice.org/F-13 openoffice.org.spec, 1.2167, 1.2168 workspace.cmcfixes67.patch, 1.3, 1.4

Mon Mar 15 14:14:07 UTC 2010

Author: caolanm

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

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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2167
retrieving revision 1.2168
diff -u -p -r1.2167 -r1.2168

--- openoffice.org.spec	15 Mar 2010 14:08:52 -0000	1.2167
+++ openoffice.org.spec	15 Mar 2010 14:14:06 -0000	1.2168
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 11
+%define rh_rpm_release 13
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -22,9 +22,6 @@
 %define stlflags --without-stlport
 %endif
 
-%define jdkflags --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj
-%define jdk_link_ver 1.4.2
-
 %if %{langpacks}
 %define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta th tr ve xh zh-CN zh-TW zu ns tn ts as mr ml or te ur kn uk mai ro
 %else
@@ -65,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
@@ -178,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
@@ -1738,7 +1735,7 @@ autoconf
  --with-system-mozilla --with-system-libtextcat --with-system-redland \
  --with-system-dicts --with-external-dict-dir=/usr/share/myspell \
  --without-myspell-dicts --without-system-mspack --without-fonts \
- --without-agg --without-ppds --without-afms \
+ --without-agg --without-ppds --without-afms --without-system-saxon \
  %{stlflags} --with-lang="%{langpack_langs}" \
  --with-poor-help-localizations="$POORHELPS" \
  --disable-graphite # for now
@@ -2520,6 +2517,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
@@ -4197,6 +4195,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
+
 * Mon Mar 08 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.11
 - Resolves: rhbz#571100 fix .svg import crash (caolanm)
 

workspace.cmcfixes67.patch:
 a/transex3/source/help/MANIFEST.MF           |    2 
 configure.in                                 |  112 ++++++++++++++++-----------
 transex3/source/help/makefile.mk             |   19 ----
 ucb/source/ucp/gio/gio_mount.cxx             |    2 
 xmlhelp/source/com/sun/star/help/MANIFEST.MF |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |    8 -
 6 files changed, 74 insertions(+), 70 deletions(-)

Index: workspace.cmcfixes67.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/workspace.cmcfixes67.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.cmcfixes67.patch	17 Dec 2009 10:40:54 -0000	1.3
+++ workspace.cmcfixes67.patch	15 Mar 2010 14:14:06 -0000	1.4
@@ -225,7 +225,7 @@ diff -r dd90334f8680 xmlhelp/source/com/
 diff -r dd90334f8680 xmlhelp/source/com/sun/star/help/makefile.mk
 --- a/xmlhelp/source/com/sun/star/help/makefile.mk	Mon Nov 16 21:01:44 2009 +0100
 +++ b/xmlhelp/source/com/sun/star/help/makefile.mk	Tue Nov 24 13:21:57 2009 +0000
-@@ -77,14 +77,15 @@
+@@ -77,14 +73,15 @@
  JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar 
  .IF "$(SYSTEM_LUCENE)" == "YES"
  XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
@@ -243,24 +243,20 @@ diff -r dd90334f8680 xmlhelp/source/com/
   
  # --- Targets ------------------------------------------------------
  
-@@ -94,7 +95,6 @@
+@@ -93,15 +90,14 @@
+ ALLTAR : $(ADDFILES)
  
  .IF "$(JARTARGETN)"!=""
++$(JAVATARGET) : $(ADDFILES)
  $(JARTARGETN) : $(ADDFILES)
 -$(JARTARGETN) : $(COMP)
  .ENDIF
  
  $(CLASSDIR)$/$(PACKAGE)$/%.class : $(SOLARBINDIR)$/help$/$(PACKAGE)$/%.class 
-@@ -102,11 +102,6 @@
+ 	$(MKDIRHIER) $(@:d)	
  	$(COPY) $< $@
  
- 
--fix_system_lucene:
--	@echo "Fix Java Class-Path entry for Lucene libraries from system."
--	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
--	-i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
--.ELSE
- all:
--        @echo java disabled
-+	@echo java disabled
- .ENDIF
+-
+ fix_system_lucene:
+ 	@echo "Fix Java Class-Path entry for Lucene libraries from system."
+ 	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \

