rpms/openoffice.org/devel workspace.fwk140.patch, NONE, 1.1 openoffice.org.spec, 1.2183, 1.2184 openoffice.org-3.3.0.ooo110747.plugin.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20768

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk140.patch 
Removed Files:
	openoffice.org-3.3.0.ooo110747.plugin.patch 
Log Message:
rename to track upstream workspace

workspace.fwk140.patch:
 so_main.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE workspace.fwk140.patch ---
diff -r 4495864f1d5b extensions/source/nsplugin/source/so_main.cxx
--- a/extensions/source/nsplugin/source/so_main.cxx	Fri Apr 09 10:22:18 2010 +0100
+++ b/extensions/source/nsplugin/source/so_main.cxx	Sat Apr 10 14:42:04 2010 +0100
@@ -126,7 +126,7 @@
     return -1;
 }
 
-int find_cur_node(sal_Int32 cur_id)
+int find_cur_node(long cur_id)
 {
     for(int i=0; i<MAX_NODE_NUM; i++)
     {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2183
retrieving revision 1.2184
diff -u -p -r1.2183 -r1.2184
--- openoffice.org.spec	13 Apr 2010 16:36:35 -0000	1.2183
+++ openoffice.org.spec	14 Apr 2010 08:46:59 -0000	1.2184
@@ -142,7 +142,7 @@ Patch71: openoffice.org-3.2.0.ooo109766.
 Patch72: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
 Patch73: openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch
 Patch74: openoffice.org-3.3.0.rh577812.i18npool.viramacursor.patch
-Patch75: openoffice.org-3.3.0.ooo110747.plugin.patch
+Patch75: workspace.fwk140.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1698,7 +1698,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch72 -p0 -b .ooo110142.svx.safercolornames.patch
 %patch73 -p1 -b .ooo110523.rdf.resetsecprefs.patch
 %patch74 -p0 -b .rh577812.i18npool.viramacursor.patch
-%patch75 -p1 -b .ooo110747.plugin.patch
+%patch75 -p1 -b .workspace.fwk140.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`


--- openoffice.org-3.3.0.ooo110747.plugin.patch DELETED ---