rpms/openoffice.org/FC-4 workspace.cmcfixes19.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	workspace.cmcfixes19.patch 
Log Message:
for fc4

workspace.cmcfixes19.patch:
 readlicense_oo/docs/readme.xsl                       |    2 +-
 readlicense_oo/util/makefile.pmk                     |   12 ++++--------
 sc/addin/datefunc/makefile.mk                        |    2 +-
 sc/addin/rot13/makefile.mk                           |    4 ++--
 sc/util/makefile.mk                                  |    3 ++-
 scp2/source/ooo/file_ooo.scp                         |    2 ++
 scp2/source/ooo/makefile.mk                          |    4 ++++
 svx/source/intro/makefile.mk                         |    1 +
 svx/source/unodialogs/textconversiondlgs/makefile.mk |    2 ++
 sw/util/makefile.mk                                  |    1 +
 10 files changed, 20 insertions(+), 13 deletions(-)

Index: workspace.cmcfixes19.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/workspace.cmcfixes19.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.cmcfixes19.patch	28 Sep 2005 13:24:05 -0000	1.1
+++ workspace.cmcfixes19.patch	3 Oct 2005 07:26:28 -0000	1.2
@@ -1,59 +1,3 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.135
-retrieving revision 1.135.16.1
-diff -u -p -u -r1.135 -r1.135.16.1
---- openoffice.org.orig/config_office/configure.in	30 Aug 2005 09:34:09 -0000	1.135
-+++ openoffice.org/config_office/configure.in	23 Sep 2005 09:28:40 -0000	1.135.16.1
-@@ -4194,6 +4194,8 @@ else
- fi
- AC_SUBST(LOCAL_SOLVER)
- 
-+BUILD_TYPE="$BUILD_TYPE XALAN"
-+
- AC_SUBST(BUILD_TYPE)
- 
- # make sure config.guess is +x; we execute config.guess, so it has to be so; 
-Index: prj/build.lst
-===================================================================
-RCS file: /cvs/framework/filter/prj/build.lst,v
-retrieving revision 1.22
-retrieving revision 1.22.170.1
-diff -u -p -u -r1.22 -r1.22.170.1
---- openoffice.org.orig/filter/prj/build.lst	2 Feb 2005 13:45:49 -0000	1.22
-+++ openoffice.org/filter/prj/build.lst	23 Sep 2005 08:19:54 -0000	1.22.170.1
-@@ -1,4 +1,4 @@
--fl	filter	:	svtools unotools goodies xmloff svx javaunohelper jvmaccess xalan NULL
-+fl	filter	:	svtools unotools goodies xmloff svx javaunohelper jvmaccess XALAN:xalan NULL
- fl	filter									usr1	-	all	fl_mkout			NULL
- fl	filter\prj								get		-	all	fl_prj				NULL
- fl	filter\source\jars						nmake	-	all	fl_javafilter_binaries	NULL
-Index: source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.12
-retrieving revision 1.12.18.1
-diff -u -p -u -r1.12 -r1.12.18.1
---- openoffice.org.orig/filter/source/config/fragments/makefile.mk	8 Sep 2005 21:33:23 -0000	1.12
-+++ openoffice.org/filter/source/config/fragments/makefile.mk	23 Sep 2005 09:27:33 -0000	1.12.18.1
-@@ -148,12 +148,12 @@ ALLTAR: \
- #cmc, hack to workaround the java build requirement
- MERGE:=python ../tools/merge/pyAltFCFGMerge
- .ELSE
--MERGE    := $(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar
-+MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
- .IF "$(JDK)" == "gcj"
--PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
--.ELSE
--PACKLANG := $(JAVA) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+XALANCLASS=$(SOLARBINDIR)/xalan.jar
-+CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
- .ENDIF
-+PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
- 
- # -----------------------------------------------------------------------------
 Index: docs/readme.xsl
 ===================================================================
 RCS file: /cvs/installation/readlicense/docs/readme.xsl,v
@@ -259,17 +203,3 @@
  DEF3NAME=       $(SHL3TARGET)
  
  SHL3STDLIBS= \
-Index: prj/build.lst
-===================================================================
-RCS file: /cvs/installation/wizards/prj/build.lst,v
-retrieving revision 1.39
-retrieving revision 1.39.14.1
-diff -u -p -u -r1.39 -r1.39.14.1
---- openoffice.org.orig/wizards/prj/build.lst	16 Aug 2005 09:28:05 -0000	1.39
-+++ openoffice.org/wizards/prj/build.lst	23 Sep 2005 08:14:20 -0000	1.39.14.1
-@@ -1,4 +1,4 @@
--wz      wizards     :   rsc javaunohelper jut unoil QADEVOOO:qadevOOo xalan transex3 NULL
-+wz      wizards     :   rsc javaunohelper jut unoil QADEVOOO:qadevOOo XALAN:xalan transex3 NULL
- wz      wizards\util                                            nmake           -       all     wz_util NULL
- wz      wizards\source\config                                   nmake           -       all     wz_config NULL
- wz      wizards\source\imagelists                               nmake           -       all     wz_imglists NULL