rpms/openoffice.org/devel workspace.cmcfixes32.patch, NONE, 1.1 openoffice.org.spec, 1.1028, 1.1029 openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch, 1.1, NONE openoffice.org-2.2.0.oooXXXXX.odk.nosandbox.patch, 1.1, NONE

Wed Feb 7 14:36:49 UTC 2007

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes32.patch 
Removed Files:
	openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch 
	openoffice.org-2.2.0.oooXXXXX.odk.nosandbox.patch 
Log Message:
upstream some work

workspace.cmcfixes32.patch:
 extensions/source/plugin/base/makefile.mk |    4 ++++
 odk/pack/gendocu/makefile.mk              |    5 ++++-
 pack/gendocu/makefile.mk                  |    0 
 source/plugin/base/makefile.mk            |    0 
 4 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE workspace.cmcfixes32.patch ---
Index: source/plugin/base/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/plugin/base/makefile.mk,v
retrieving revision 1.11
diff -u -r1.11 makefile.mk
--- openoffice.org.orig/extensions/source/plugin/base/makefile.mk	8 Mar 2006 14:16:22 -0000	1.11
+++ openoffice.org/extensions/source/plugin/base/makefile.mk	23 Jan 2007 15:35:34 -0000
@@ -48,6 +48,10 @@
 CDEFS+=-DOJI
 .ENDIF
 
+.IF "$(DISABLE_XAW)" != ""
+CDEFS+=-DDISABLE_XAW
+.ENDIF
+
 .IF "$(WITH_MOZILLA)" != "NO"
 
 SLOFILES=		\
Index: pack/gendocu/makefile.mk
===================================================================
RCS file: /cvs/api/odk/pack/gendocu/makefile.mk,v
retrieving revision 1.16
diff -u -r1.16 makefile.mk
--- openoffice.org.orig/odk/pack/gendocu/makefile.mk	5 Jul 2006 21:53:58 -0000	1.16
+++ openoffice.org/odk/pack/gendocu/makefile.mk	7 Feb 2007 13:49:14 -0000
@@ -64,8 +64,11 @@
         $(JAVA_SRC_DIR)$/jut_src.zip \
         $(JAVA_SRC_DIR)$/juh_src.zip \
         $(JAVA_SRC_DIR)$/ridl_src.zip \
-        $(JAVA_SRC_DIR)$/sandbox_src.zip \
         $(JAVA_SRC_DIR)$/unoloader_src.zip
+
+.IF "$(JDK)" != "gcj"
+        JAVA_SRC_FILES += $(JAVA_SRC_DIR)$/sandbox_src.zip
+.ENDIF
 
 JAVA_BEAN_SRC_FILES=\
         $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/ContainerFactory.java \


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1028
retrieving revision 1.1029
diff -u -r1.1028 -r1.1029
--- openoffice.org.spec	7 Feb 2007 14:14:52 -0000	1.1028
+++ openoffice.org.spec	7 Feb 2007 14:36:47 -0000	1.1029
@@ -114,14 +114,13 @@
 Patch47: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
 Patch48: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch
 Patch49: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch50: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch
+Patch50: workspace.cmcfixes32.patch
 Patch51: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
 Patch52: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
 Patch53: openoffice.org-2.2.0.oooXXXXX.binfilter.toodeep.patch
 Patch54: openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch
 Patch55: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
 Patch56: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
-Patch57: openoffice.org-2.2.0.oooXXXXX.odk.nosandbox.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -997,14 +996,13 @@
 %patch47 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
 %patch48 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch
 %patch49 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch50 -p1 -b .oooXXXXX.extensions.noxaw.patch
+%patch50 -p1 -b .workspace.cmcfixes32.patch
 %patch51 -p1 -b .ooo73863.vcl.imcommit.patch
 %patch52 -p1 -b .ooo73974.bridges.doublereturn.patch
 # %patch53 -p1 -b .oooXXXXX.binfilter.toodeep.patch
 %patch54 -p1 -b .oooXXXXX.atkthreads.atexit.patch
 %patch55 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
 %patch56 -p1 -b .ooo74255.vcl.depth.mismatch.patch
-%patch57 -p1 -b .oooXXXXX.odk.nosandbox.patch
 
 %if %{langpacks}
 tar xzf %{SOURCE1}


--- openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch DELETED ---


--- openoffice.org-2.2.0.oooXXXXX.odk.nosandbox.patch DELETED ---


