rpms/openoffice.org/devel openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch, 1.4, 1.5

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 
Log Message:
move Evolution database after Biblio database to get Biblio as the first database tested in smoketest

openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch:
 extensions/source/abpilot/abspilot.cxx                                      |    8 ---
 openoffice.org/extras/source/database/makefile.mk                           |    4 -
 openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu |    8 +++
 openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu     |   26 ++++++++++
 4 files changed, 38 insertions(+), 8 deletions(-)

Index: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch	13 Jul 2010 10:16:52 -0000	1.4
+++ openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch	13 Jul 2010 11:56:32 -0000	1.5
@@ -48,10 +48,10 @@
  ZIP2LIST        = biblio.dbf biblio.dbt
 --- openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu.bakj	2005-03-16 18:51:43.777536725 +0530
 +++ openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	2005-03-16 18:52:51.471404727 +0530
-@@ -153,6 +153,14 @@
-     </node>
-   </node>
-   <node oor:name="RegisteredNames">
+@@ -161,6 +161,14 @@
+ 			<value>Bibliography</value>
+ 		</prop>
+ 	</node>
 +    <node oor:name="EvolutionLocal" oor:op="replace">
 +		<prop oor:name="Location" oor:type="xs:string">
 +			<value>$(userurl)/database/evolocal.odb</value>
@@ -60,9 +60,9 @@
 +			<value>EvolutionLocal</value>
 +		</prop>
 +	</node>
-     <node oor:name="org.openoffice.Bibliography" oor:op="replace">
- 		<prop oor:name="Location" oor:type="xs:string">
- 			<value>$(userurl)/database/biblio.odb</value>
+   </node>
+   <node oor:name="Bibliography">
+     <node oor:name="CurrentDataSource">
 --- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx	19 Dec 2005 17:26:24 -0000	1.13
 +++ openoffice.org/extensions/source/abpilot/abspilot.cxx	16 Feb 2006 12:45:38 -0000
 @@ -124,12 +124,8 @@