rpms/openoffice.org/F-13 openoffice.org-3.3.0.ooo110747.plugin.patch, NONE, 1.1 openoffice.org.spec, 1.2173, 1.2174

Caolan McNamara caolanm at fedoraproject.org
Sat Apr 10 13:53:02 UTC 2010


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17864/F-13

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo110747.plugin.patch 
Log Message:
add openoffice.org-3.3.0.ooo110747.plugin.patch

openoffice.org-3.3.0.ooo110747.plugin.patch:
 so_main.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.3.0.ooo110747.plugin.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/F-13/openoffice.org.spec,v
retrieving revision 1.2173
retrieving revision 1.2174
diff -u -p -r1.2173 -r1.2174
--- openoffice.org.spec	6 Apr 2010 06:01:53 -0000	1.2173
+++ openoffice.org.spec	10 Apr 2010 13:53:01 -0000	1.2174
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 15
+%define rh_rpm_release 16
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -141,6 +141,7 @@ Patch70: openoffice.org-3.2.0.ooo109743.
 Patch71: openoffice.org-3.2.0.ooo109766.dbaccess.catch.patch
 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.ooo110747.plugin.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1714,6 +1715,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch71 -p0 -b .ooo109766.dbaccess.catch.patch
 %patch72 -p0 -b .ooo110142.svx.safercolornames.patch
 %patch73 -p1 -b .ooo110523.rdf.resetsecprefs.patch
+%patch74 -p1 -b .ooo110747.plugin.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4199,6 +4201,9 @@ fi
 %endif
 
 %changelog
+* Sat Apr 10 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.16
+- add openoffice.org-3.3.0.ooo110747.plugin.patch
+
 * Tue Apr 06 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.15
 - Resolves: rhbz#574542 [abrt] crash in
   slideshow::internal::EventMultiplexerImpl::forEachView<> (dtardon)



More information about the scm-commits mailing list