rpms/openoffice.org/devel openoffice.org.spec, 1.2104, 1.2105 workspace.cmcfixes67.patch, 1.2, 1.3 workspace.vcl108.patch, 1.3, 1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24835

Modified Files:
	openoffice.org.spec workspace.cmcfixes67.patch 
	workspace.vcl108.patch 
Log Message:
drop integrated openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2104
retrieving revision 1.2105
diff -u -p -r1.2104 -r1.2105
--- openoffice.org.spec	17 Dec 2009 10:32:34 -0000	1.2104
+++ openoffice.org.spec	17 Dec 2009 10:40:54 -0000	1.2105
@@ -125,12 +125,11 @@ Patch47: workspace.cmcfixes67.patch
 Patch48: workspace.srb1.patch
 Patch49: workspace.impress184.patch
 Patch50: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch51: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
-Patch52: openoffice.org-3.3.0.ooo102645.fix.es.patch
-Patch53: workspace.vcl108.patch
-Patch54: workspace.pythonssldedux.patch
-Patch55: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch56: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch51: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch52: workspace.vcl108.patch
+Patch53: workspace.pythonssldedux.patch
+Patch54: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch55: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1653,12 +1652,11 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch48 -p1 -b .workspace.srb1.patch
 %patch49 -p0 -b .workspace.impress184.patch
 %patch50 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch51 -p1 -b .ooo107151.sc.pop-empty-cell.patch
-%patch52 -p0 -b .ooo102645.fix.es.patch
-%patch53 -p0 -b .workspace.vcl108.patch
-%patch54 -p1 -b .workspace.pythonssldedux.patch
-%patch55 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch56 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch51 -p0 -b .ooo102645.fix.es.patch
+%patch52 -p0 -b .workspace.vcl108.patch
+%patch53 -p1 -b .workspace.pythonssldedux.patch
+%patch54 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch55 -p0 -b .ooo47279.sd.objectsave.safe.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4167,6 +4165,7 @@ fi
 - drop integrated workspace.fwk132.patch
 - drop unnecessary openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 - drop integrated openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+- drop integrated openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
 
 * Tue Dec 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-7.3
 - Resolves: rhbz#529648 add workspace.fwk132.patch

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 |   13 ---
 6 files changed, 74 insertions(+), 75 deletions(-)

Index: workspace.cmcfixes67.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes67.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.cmcfixes67.patch	26 Nov 2009 17:10:56 -0000	1.2
+++ workspace.cmcfixes67.patch	17 Dec 2009 10:40:54 -0000	1.3
@@ -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
-@@ -76,14 +76,15 @@
+@@ -77,14 +77,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,7 +243,7 @@ diff -r dd90334f8680 xmlhelp/source/com/
   
  # --- Targets ------------------------------------------------------
  
-@@ -93,15 +94,8 @@
+@@ -94,7 +95,6 @@
  
  .IF "$(JARTARGETN)"!=""
  $(JARTARGETN) : $(ADDFILES)
@@ -251,11 +251,16 @@ diff -r dd90334f8680 xmlhelp/source/com/
  .ENDIF
  
  $(CLASSDIR)$/$(PACKAGE)$/%.class : $(SOLARBINDIR)$/help$/$(PACKAGE)$/%.class 
- 	$(MKDIRHIER) $(@:d)	
+@@ -102,11 +102,6 @@
  	$(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

workspace.vcl108.patch:
 source/fontsubset/sft.cxx           |   20 +++++++
 unx/source/dtrans/X11_selection.cxx |   92 ++++++++++++++++++++++++++++++++----
 unx/source/dtrans/X11_selection.hxx |   18 ++++++-
 util/makefile.mk                    |    1 
 4 files changed, 117 insertions(+), 14 deletions(-)

Index: workspace.vcl108.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl108.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.vcl108.patch	9 Dec 2009 12:40:34 -0000	1.3
+++ workspace.vcl108.patch	17 Dec 2009 10:40:54 -0000	1.4
@@ -212,33 +212,6 @@ diff -ru vcl/util/makefile.mk vcl/util/m
              $(CPPUHELPERLIB) \
              $(CPPULIB) \
              $(SALLIB)
-diff -ru vcl/source/gdi/pdfwriter_impl.hxx vcl/source/gdi/pdfwriter_impl.hxx
---- vcl/source/gdi/pdfwriter_impl.hxx	2009-12-01 15:26:48.000000000 +0000
-+++ vcl/source/gdi/pdfwriter_impl.hxx	2009-12-01 15:30:18.000000000 +0000
-@@ -679,6 +679,7 @@
-                 m_aOverlineColor( COL_TRANSPARENT ),
-                 m_nAntiAlias( 1 ),
-                 m_nLayoutMode( 0 ),
-+                m_aDigitLanguage( 0 ),
-                 m_nTransparentPercent( 0 ),
-                 m_nFlags( 0xffff ),
-                 m_nUpdateFlags( 0xffff )
-@@ -693,6 +694,7 @@
-                 m_aClipRegion( rState.m_aClipRegion ),
-                 m_nAntiAlias( rState.m_nAntiAlias ),
-                 m_nLayoutMode( rState.m_nLayoutMode ),
-+                m_aDigitLanguage( rState.m_aDigitLanguage ),
-                 m_nTransparentPercent( rState.m_nTransparentPercent ),
-                 m_nFlags( rState.m_nFlags ),
-                 m_nUpdateFlags( rState.m_nUpdateFlags )
-@@ -710,6 +712,7 @@
-             m_aClipRegion			= rState.m_aClipRegion;
-             m_nAntiAlias			= rState.m_nAntiAlias;
-             m_nLayoutMode			= rState.m_nLayoutMode;
-+            m_aDigitLanguage        = rState.m_aDigitLanguage;
-             m_nTransparentPercent	= rState.m_nTransparentPercent;
-             m_nFlags				= rState.m_nFlags;
-             m_nUpdateFlags          = rState.m_nUpdateFlags;
 --- vcl/source/fontsubset/sft.cxx	2009-12-09 10:16:54.000000000 +0000
 +++ vcl/source/fontsubset/sft.cxx	2009-12-09 10:17:54.000000000 +0000
 @@ -1094,6 +1094,14 @@