rpms/openoffice.org/devel workspace.cmcfixes54.patch, NONE, 1.1 workspace.jl115.patch, NONE, 1.1 openoffice.org.spec, 1.1772, 1.1773 openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch, 1.1, NONE openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes54.patch workspace.jl115.patch 
Removed Files:
	openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch 
	openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch 
Log Message:
rename to accepted upstream workspaces

workspace.cmcfixes54.patch:

--- NEW FILE workspace.cmcfixes54.patch ---
Index: source/ucp/webdav/NeonPropFindRequest.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonPropFindRequest.cxx,v
retrieving revision 1.24
diff -u -r1.24 NeonPropFindRequest.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	10 Apr 2008 15:40:55 -0000	1.24
+++ openoffice.org/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	20 Jan 2009 16:21:07 -0000
@@ -103,8 +104,12 @@
 			if ( aValue.getLength() )
 			{
                 aValue = aValue.toAsciiLowerCase();
-				if ( aValue.compareTo(
-						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 )
+				if (
+				    ( aValue.compareTo(
+						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 ) ||
+				    ( aValue.compareTo(
+						RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
+				   )
 				{
 					thePropertyValue.Value
 						<<= OUString::createFromAscii( "collection" );

workspace.jl115.patch:

--- NEW FILE workspace.jl115.patch ---
diff -ru desktop/source/deployment/manager/dp_manager.cxx desktop/source/deployment/manager/dp_manager.cxx
--- openoffice.org.orig/desktop/source/deployment/manager/dp_manager.cxx	2008-10-14 16:04:24.000000000 +0100
+++ openoffice.org/desktop/source/deployment/manager/dp_manager.cxx	2008-10-14 16:06:25.000000000 +0100
@@ -1074,6 +1074,12 @@
             OSL_ENSURE( 0, ::rtl::OUStringToOString(
                             exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
         }
+        catch (deployment::DeploymentException& exc) {
+            // ignore
+            (void) exc; // avoid warnings
+            OSL_ENSURE( 0, ::rtl::OUStringToOString(
+                            exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+        }
     }
     return comphelper::containerToSequence(packages);
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1772
retrieving revision 1.1773
diff -u -r1.1772 -r1.1773
--- openoffice.org.spec	24 Jan 2009 22:48:22 -0000	1.1772
+++ openoffice.org.spec	27 Jan 2009 09:22:12 -0000	1.1773
@@ -108,7 +108,7 @@
 Patch37: workspace.cmcfixes50.patch
 Patch38: workspace.vcl94.patch
 Patch39: workspace.vcl95.patch
-Patch40: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
+Patch40: workspace.jl115.patch
 Patch41: workspace.mhu17.patch
 Patch42: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
 Patch43: openoffice.org-3.0.0.ooo95318.system-showicons.patch
@@ -133,7 +133,7 @@
 Patch62: workspace.fwk99.patch
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
-Patch65: openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
+Patch65: workspace.cmcfixes54.patch
 Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
@@ -1395,7 +1395,7 @@
 %patch37 -p1 -b .workspace.cmcfixes50.patch
 %patch38 -p1 -b .workspace.vcl94.patch
 %patch39 -p1 -b .workspace.vcl95.patch
-%patch40 -p1 -b .ooo94938.unopkg.handleexception.patch
+%patch40 -p1 -b .workspace.jl115.patch
 %patch41 -p1 -b .workspace.mhu17.patch
 %patch42 -p1 -b .ooo95018.sal.fdwarnings.patch
 %patch43 -p1 -b .ooo95318.system-showicons.patch
@@ -1420,7 +1420,7 @@
 %patch62 -p1 -b .workspace.fwk99.patch
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
-%patch65 -p1 -b .ooo98288.ucb.neonchange.patch
+%patch65 -p1 -b .workspace.cmcfixes54.patch
 %patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %build


--- openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch DELETED ---


--- openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch DELETED ---