rpms/openoffice.org/devel openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch, NONE, 1.1 openoffice.org.spec, 1.1186, 1.1187

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23381

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch 
Log Message:
add openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch

openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch:

--- NEW FILE openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch ---
Index: source/deployment/gui/dp_gui_updatedialog.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/deployment/gui/dp_gui_updatedialog.cxx,v
retrieving revision 1.2.14.1
diff -u -r1.2.14.1 dp_gui_updatedialog.cxx
--- openoffice.org.orig/desktop/source/deployment/gui/dp_gui_updatedialog.cxx	26 Jan 2007 11:52:14 -0000	1.2.14.1
+++ openoffice.org/desktop/source/deployment/gui/dp_gui_updatedialog.cxx	24 May 2007 13:45:24 -0000
@@ -495,7 +495,7 @@
         package->getUpdateInformationURLs());
     if (urls.getLength() == 0) {
         map->insert(
-            std::pair< Map::key_type const, Map::data_type >(
+            std::pair< Map::key_type const, Map::mapped_type >(
                 id, Entry(package, packageManager, package->getVersion())));
     } else {
         css::uno::Sequence< css::uno::Reference< css::xml::dom::XElement > >


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1186
retrieving revision 1.1187
diff -u -r1.1186 -r1.1187
--- openoffice.org.spec	23 May 2007 15:37:35 -0000	1.1186
+++ openoffice.org.spec	24 May 2007 13:47:32 -0000	1.1187
@@ -138,6 +138,7 @@
 Patch72: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
 Patch73: workspace.cmcfixes34.patch
 Patch74: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
+Patch75: openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1070,6 +1071,7 @@
 %patch72 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
 %patch73 -p1 -b .workspace.cmcfixes34.patch
 %patch74 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
+%patch75 -p1 -b .ooo73728.desktop.mapped_type.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2653,6 +2655,7 @@
 - remove LD_LIBRARY_PATH again, the third party extension requiring it 
   links against the wrong libraries
 - try and re-disable stlport for selected platforms
+- add openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch fix
 
 * Tue May 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.1
 - next 2.2.1 release candidate