rpms/openoffice.org/devel openoffice.org.spec, 1.1814, 1.1815 workspace.vcl100.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo99411.sysui.add.dbf-mimetype.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-serv30118

Modified Files:
	openoffice.org.spec workspace.vcl100.patch 
Removed Files:
	openoffice.org-3.1.0.ooo99411.sysui.add.dbf-mimetype.patch 
Log Message:
upstream merged into vcl100 already


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1814
retrieving revision 1.1815
diff -u -r1.1814 -r1.1815
--- openoffice.org.spec	19 Feb 2009 11:59:38 -0000	1.1814
+++ openoffice.org.spec	19 Feb 2009 12:07:30 -0000	1.1815
@@ -126,7 +126,6 @@
 Patch53: workspace.vcl100.patch
 Patch54: workspace.xmergeclean.patch
 Patch55: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch56: openoffice.org-3.1.0.ooo99411.sysui.add.dbf-mimetype.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1587,7 +1586,6 @@
 %patch53 -p0 -b .workspace.vcl100.patch
 %patch54 -p0 -b .workspace.xmergeclean.patch
 %patch55 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch56 -p0 -b .ooo99411.sysui.add.dbf-mimetype.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl100.patch:

Index: workspace.vcl100.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl100.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl100.patch	17 Feb 2009 08:52:51 -0000	1.1
+++ workspace.vcl100.patch	19 Feb 2009 12:07:30 -0000	1.2
@@ -254,3 +254,14 @@
                  // SubMenu?
                  if ( !bLayout && !bIsMenuBar && pData->pSubMenu )
                  {
+--- sysui.orig/desktop/menus/calc.desktop	2009-02-19 11:34:26.000000000 +0000
++++ sysui/desktop/menus/calc.desktop	2009-02-19 11:37:17.000000000 +0000
+@@ -5,7 +5,7 @@
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
+ Exec=openoffice -calc %U
+-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;
++MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;
+ Name=%PRODUCTNAME Calc
+ GenericName=Spreadsheet
+ Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.


--- openoffice.org-3.1.0.ooo99411.sysui.add.dbf-mimetype.patch DELETED ---