rpms/openoffice.org/devel openoffice.org-3.1.0.ooo100991.pyuno-fix.patch, NONE, 1.1 openoffice.org.spec, 1.1874, 1.1875 openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.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-serv2161

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo100991.pyuno-fix.patch 
Removed Files:
	openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch 
Log Message:
fix up as ooo#100991

openoffice.org-3.1.0.ooo100991.pyuno-fix.patch:

--- NEW FILE openoffice.org-3.1.0.ooo100991.pyuno-fix.patch ---
--- openoffice.org.orig/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:52.000000000 +0100
+++ openoffice.org/scripting/source/pyprov/pythonscript.py	2009-04-08 15:08:56.000000000 +0100
@@ -762,7 +762,7 @@
             
             log.isDebugLevel() and log.debug( "got urlHelper " + str( urlHelper ) )
         
-            rootUrl = expandUri( urlHelper.getRootStorageURI() )
+            rootUrl = urlHelper.getRootStorageURI()
             log.isDebugLevel() and log.debug( storageType + " transformed to " + rootUrl )
 
             ucbService = "com.sun.star.ucb.SimpleFileAccess"


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1874
retrieving revision 1.1875
diff -u -r1.1874 -r1.1875
--- openoffice.org.spec	9 Apr 2009 12:08:49 -0000	1.1874
+++ openoffice.org.spec	9 Apr 2009 14:52:54 -0000	1.1875
@@ -133,7 +133,7 @@
 Patch58: openoffice.org-3.1.0.ooo100225.comphelper.vis.patch
 Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
 Patch60: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch61: openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch
+Patch61: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1625,7 +1625,7 @@
 %patch58 -p0 -b .ooo100225.comphelper.vis.patch
 %patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
 %patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch61 -p1 -b .oooXXXXX.partial-revert-ooo95118.patch
+%patch61 -p1 -b .ooo100991.pyuno-fix.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch DELETED ---