rpms/openoffice.org/devel openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch, NONE, 1.1 openoffice.org.spec, 1.284, 1.285

[fedora-cvs-commits redhat com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29080

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch 
Log Message:
still need that export

openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch:
 config_office/configure.in |    5 ++++-
 inc/tg_config.mk           |    0 
 solenv/inc/tg_config.mk    |   10 +++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.126
diff -u -r1.126 configure.in
--- openoffice.org.orig/config_office/configure.in	21 Jun 2005 10:13:47 -0000	1.126
+++ openoffice.org/config_office/configure.in	8 Jul 2005 09:42:26 -0000
@@ -105,6 +105,9 @@
                           assertions, object counting, etc. Larger build.
                           Independent from --enable-debug
 ],,)
+AC_ARG_ENABLE(xsltproc,
+[  --enable-xsltproc:      Use xsltproc at buildtime, even when java is available
+],,)
 AC_ARG_ENABLE(crashdump,
 [[  --enable-crashdump[=yes|TRUE|STATIC|no]
                           Enable (disable) the crashdump feature code. [default=STATIC]
@@ -1979,7 +1982,7 @@
 fi
 AC_SUBST(JAVACACHE)
 
-if test "$NEEDXSLTPROC" = "no"; then
+if test "$NEEDXSLTPROC" = "no" && test -z "$enable_xsltproc"; then
    XSLTPROC=NO_XSLTPROC
 else
    dnl Check for xsltproc
Index: inc/tg_config.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_config.mk,v
retrieving revision 1.2
diff -u -p -u -r1.2 tg_config.mk
--- openoffice.org.orig/solenv/inc/tg_config.mk	15 Mar 2005 13:00:23 -0000	1.2
+++ openoffice.org/solenv/inc/tg_config.mk	8 Jul 2005 09:36:02 -0000
@@ -84,7 +84,7 @@ $(XCS_TRIM) :   $(PRJ)$/registry$/compon
 $(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
     @+echo -------------+ validating and stripping schema files
 	-$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 .IF "$(NO_INSPECTION)"==""
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
 .ENDIF			# "$(NO_INSPECTION)"==""
@@ -124,7 +124,7 @@ $(XCS_RESOURCES) :   $(XSLDIR)$/resource
 $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs
     @+echo -------------+ creating locale dependent resource bundles
 	-$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
 .ELSE
 	$(XSLTPROC) -o $@ \
@@ -142,7 +142,7 @@ $(XCU_DEFAULT) : $(PRJ)$/registry$/compo
 $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu
     @+echo -------------+ validating and creating a locale independent file
 	-$(MKDIRHIER) $(@:d) 
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 .IF "$(NO_INSPECTION)"==""
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
 .ENDIF			# "$(NO_INSPECTION)"==""
@@ -184,7 +184,7 @@ $(XCU_LANG) : $(XSLDIR)$/alllang.xsl 
 $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu
     @+echo -------------+ creating locale dependent entries
 	-$(MKDIRHIER) $(@:d)
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
 .ELSE
@@ -220,7 +220,7 @@ $(XCU_MODULES) : $(XSLDIR)$/alllang.xsl 
 $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu
     @+echo -------------+ creating a module file
 	-$(MKDIRHIER) $(@:d) 
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(XSLTPROC)"=="NO_XSLTPROC"
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
 	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
 .ELSE


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- openoffice.org.spec	8 Jul 2005 08:57:30 -0000	1.284
+++ openoffice.org.spec	8 Jul 2005 11:25:41 -0000	1.285
@@ -58,7 +58,7 @@
 BuildRequires: 	expat-devel, libxml2-devel, openldap-devel, neon-devel >= 0.24 
 BuildRequires: 	libidn-devel, startup-notification-devel, libwpd-devel >= 0.8.0
 BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, tcsh
-BuildRequires:	perl-Archive-Zip, evolution-data-server-devel
+BuildRequires:	perl-Archive-Zip, evolution-data-server-devel, libxslt >= 1.1.14
 
 Patch0:  openoffice.org-1.9.80.NONE.skipuselessmodules.patch
 Patch1:  openoffice.org-1.9.71s1.noregisterwizard.patch
@@ -104,7 +104,7 @@
 Patch41: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
 Patch42: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
 Patch43: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
-#Patch44: openoffice.org-1.9.112.oooXXXXX.testtools.patch
+Patch44: openoffice.org-1.9.112.oooXXXXX.testtools.patch
 Patch45: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
 Patch46: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
 Patch47: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
@@ -115,6 +115,7 @@
 Patch52: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
 Patch53: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
 Patch54: openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch
+Patch55: openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -738,7 +739,7 @@
 %patch41 -p1 -b .oooXXXXX.psprintfriend.patch
 %patch42 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
 %patch43 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
-#%patch44 -p1 -b .oooXXXXX.testtools.patch
+%patch44 -p1 -b .oooXXXXX.testtools.patch
 %patch45 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
 %patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
 %patch47 -p1 -b .ooo51385.bridges.stack.patch
@@ -749,6 +750,7 @@
 %patch52 -p1 -b .oooXXXXX.nostlport.patch
 %patch53 -p1 -b .ooo51673.printing.checkerror.patch
 %patch54 -p1 -b .oooXXXXX.audio.withoutnas.patch
+%patch55 -p1 -b .oooXXXXX.xsltproc.evenwithjava.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/db4 then this needs to be modified/dropped
@@ -781,7 +783,7 @@
 fi
 cd config_office
 autoconf
-%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-stlport4 %{withlang}
+%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-stlport4 %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -2928,6 +2930,8 @@
 * Thu Jul 07 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.115-2
 - add openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch
   and disable worthless nas/portaudio/sndfile stuff
+- add openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch
+  and see if we can build faster with xsltproc
 
 * Thu Jul 07 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.115-1
 - bump to next version