rpms/openoffice.org/devel openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch, NONE, 1.1 openoffice.org.spec, 1.1872, 1.1873

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.patch 
Log Message:
Revert pythonscript.py part of ooo#95118 for now

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

--- NEW FILE openoffice.org-3.1.0.oooXXXXX.partial-revert-ooo95118.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
@@ -734,8 +734,6 @@
         uri = uri.replace( "vnd.sun.star.expand:", "",1)
         uri = uno.getComponentContext().getByName(
                     "/singletons/com.sun.star.util.theMacroExpander" ).expandMacros( uri )
-    if uri.startswith( "file:" ):
-        uri = uno.absolutize("",uri)   # necessary to get rid of .. in uri
     return uri
     
 #--------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1872
retrieving revision 1.1873
diff -u -r1.1872 -r1.1873
--- openoffice.org.spec	8 Apr 2009 11:39:06 -0000	1.1872
+++ openoffice.org.spec	8 Apr 2009 14:12:18 -0000	1.1873
@@ -132,6 +132,7 @@
 Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
 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.oooXXXXX.partial-revert-ooo95118.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1623,6 +1624,7 @@
 %patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
 %patch58 -p0 -b .ooo100225.comphelper.vis.patch
 %patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
+%patch60 -p1 -b .oooXXXXX.partial-revert-ooo95118.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4114,6 +4116,7 @@
 - Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or, 
   hyphen-ml, hyphen-kn, hyphen-gu, hyphen-hi
 - Resolves: rhbz#494643 EMF polypolygons issue
+- Revert pythonscript.py part of ooo#95118 for now
 
 * Thu Apr 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.1
 - latest milestone