rpms/openoffice.org/devel openoffice.org-1.9.130.ooo54708.sc.patch, 1.1, 1.2 openoffice.org.spec, 1.482, 1.483

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.130.ooo54708.sc.patch openoffice.org.spec 
Log Message:
test2

openoffice.org-1.9.130.ooo54708.sc.patch:
 addin/datefunc/makefile.mk       |    0 
 addin/rot13/makefile.mk          |    0 
 readlicense_oo/util/makefile.pmk |   12 ++++--------
 sc/addin/datefunc/makefile.mk    |    2 +-
 sc/addin/rot13/makefile.mk       |    2 +-
 util/makefile.pmk                |    0 
 6 files changed, 6 insertions(+), 10 deletions(-)

Index: openoffice.org-1.9.130.ooo54708.sc.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.130.ooo54708.sc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.130.ooo54708.sc.patch	19 Sep 2005 07:20:04 -0000	1.1
+++ openoffice.org-1.9.130.ooo54708.sc.patch	20 Sep 2005 21:57:41 -0000	1.2
@@ -30,3 +30,49 @@
  
  $(MISC)$/rot.lst : \
  	$(MISC)$/x$(TARGET).c \
+Index: util/makefile.pmk
+===================================================================
+RCS file: /cvs/installation/readlicense/util/makefile.pmk,v
+retrieving revision 1.8
+diff -u -p -u -r1.8 makefile.pmk
+--- openoffice.org.orig/readlicense_oo/util/makefile.pmk	9 Sep 2005 05:10:20 -0000	1.8
++++ openoffice.org/readlicense_oo/util/makefile.pmk	20 Sep 2005 20:15:34 -0000
+@@ -72,17 +72,15 @@ $(MISC)$/readme%.html :
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ 	$(JAVAI) $(JAVACPS) $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
+ .ELSE
+-	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl > ..$/readme2.xsl
+-	xsltproc -o $@ \
++	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl | xsltproc -o $@ \
+ 	         --stringparam os1 $(OS) \
+ 	         --stringparam gui1 $(GUI) \
+ 	         --stringparam cp1 $(CPUNAME) \
+ 	         --stringparam com1 $(COM) \
+ 	         --stringparam lang1 $(@:b:s/_/./:e:s/.//) \
+ 	         --stringparam type html \
+-	         ..$/readme2.xsl \
++		 - \
+ 	         $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm)
+-	rm ..$/readme2.xsl
+ .ENDIF
+ 
+ $(MISC)$/readme%.txt :
+@@ -90,16 +88,14 @@ $(MISC)$/readme%.txt :
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ 	$(JAVAI) $(JAVACPS) $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
+ .ELSE
+-	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl > ..$/readme2.xsl
+-	xsltproc -o $@ \
++	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl | xsltproc -o $@ \
+ 	         --stringparam os1 $(OS) \
+ 	         --stringparam gui1 $(GUI) \
+ 	         --stringparam cp1 $(CPUNAME) \
+ 	         --stringparam com1 $(COM) \
+ 	         --stringparam lang1 $(@:b:s/_/./:e:s/.//) \
+ 	         --stringparam type text \
+-	         ..$/readme2.xsl \
++	         - \
+ 	         $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm)
+-	rm ..$/readme2.xsl
+ .ENDIF
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- openoffice.org.spec	20 Sep 2005 15:56:36 -0000	1.482
+++ openoffice.org.spec	20 Sep 2005 21:57:41 -0000	1.483
@@ -956,6 +956,7 @@
 
 %if ! %{internaljavabits}
 export CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar
+export XML_CLASSPATH=$CLASSPATH
 export SYSTEM_XALAN="YES"
 %else
 export "BUILD_TYPE=$BUILD_TYPE xalan"