rpms/openoffice.org/devel openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch, NONE, 1.1 openoffice.org.spec, 1.1811, 1.1812

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch 
Log Message:
auto type-detection for small device formats

openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch:

--- NEW FILE openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch ---
Index: source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu,v
retrieving revision 1.5
diff -u -r1.5 writer_AportisDoc_PalmDB_File.xcu
--- filter.orig/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu	20 Jul 2005 11:41:52 -0000	1.5
+++ filter/source/config/fragments/types/writer_AportisDoc_PalmDB_File.xcu	19 Feb 2009 10:31:55 -0000
@@ -1,12 +1,12 @@
 	<node oor:name="writer_AportisDoc_PalmDB_File" oor:op="replace" >
-		<prop oor:name="DetectService"/>
+		<prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
 		<prop oor:name="URLPattern"/>
 		<prop oor:name="Extensions"><value>pdb</value></prop>
-		<prop oor:name="MediaType"/>
+		<prop oor:name="MediaType"><value>application/x-aportisdoc</value></prop>
 		<prop oor:name="Preferred"><value>false</value></prop>
 		<prop oor:name="PreferredFilter"><value>AportisDoc Palm DB</value></prop>
 		<prop oor:name="UIName">
 			<value>AportisDoc (Palm)</value>
 		</prop>
-		<prop oor:name="ClipboardFormat"/>
+		<prop oor:name="ClipboardFormat"><value>doctype:TEXt</value></prop>
 	</node>
Index: source/config/fragments/types/writer_PocketWord_File.xcu
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/types/writer_PocketWord_File.xcu,v
retrieving revision 1.5
diff -u -r1.5 writer_PocketWord_File.xcu
--- filter.orig/source/config/fragments/types/writer_PocketWord_File.xcu	20 Jul 2005 11:58:40 -0000	1.5
+++ filter/source/config/fragments/types/writer_PocketWord_File.xcu	19 Feb 2009 10:31:55 -0000
@@ -1,12 +1,12 @@
 	<node oor:name="writer_PocketWord_File" oor:op="replace" >
-		<prop oor:name="DetectService"/>
+		<prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
 		<prop oor:name="URLPattern"/>
 		<prop oor:name="Extensions"><value>psw</value></prop>
-		<prop oor:name="MediaType"/>
+		<prop oor:name="MediaType"><value>application/x-pocket-word</value></prop>
 		<prop oor:name="Preferred"><value>false</value></prop>
 		<prop oor:name="PreferredFilter"><value>PocketWord File</value></prop>
 		<prop oor:name="UIName">
 			<value>Pocket Word</value>
 		</prop>
-		<prop oor:name="ClipboardFormat"/>
+		<prop oor:name="ClipboardFormat"><value>doctype:pwi</value></prop>
 	</node>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1811
retrieving revision 1.1812
diff -u -r1.1811 -r1.1812
--- openoffice.org.spec	18 Feb 2009 23:01:59 -0000	1.1811
+++ openoffice.org.spec	19 Feb 2009 10:38:48 -0000	1.1812
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 1
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -124,6 +124,7 @@
 Patch52: workspace.ooo31gsl2.patch
 Patch53: workspace.vcl100.patch
 Patch54: workspace.xmergeclean.patch
+Patch55: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1577,6 +1578,7 @@
 %patch52 -p0 -b .workspace.ooo31gsl2.patch
 %patch53 -p0 -b .workspace.vcl100.patch
 %patch54 -p0 -b .workspace.xmergeclean.patch
+%patch55 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4071,6 +4073,8 @@
 * Wed Feb 18 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-1.3
 - rhbz#486062 add workspace.xmergeclean.patch to ensure functionality
 - add Danish thesaurus requires
+- add openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
+  to auto-detect AportisDoc and PocketWord documents
 
 * Tue Feb 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-1.2
 - fix rotated glyphs