rpms/openoffice.org/devel .cvsignore, 1.257, 1.258 openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch, 1.5, 1.6 openoffice.org.spec, 1.2290, 1.2291 sources, 1.409, 1.410

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	.cvsignore 
	openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 
	openoffice.org.spec sources 
Log Message:
smoketest now build source, drop .sxw


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- .cvsignore	16 Jul 2010 11:42:20 -0000	1.257
+++ .cvsignore	16 Jul 2010 17:30:12 -0000	1.258
@@ -14,5 +14,4 @@ a7983f859eafb2677d7ff386a023bc40-xsltml_
 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-smoketestdoc.sxw
 OOO330_m1.tar.bz2

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 ++++++++++
 smoketestoo_native/data/Test_DB.xml                                         |    2 
 5 files changed, 39 insertions(+), 9 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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch	13 Jul 2010 11:56:32 -0000	1.5
+++ openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch	16 Jul 2010 17:30:12 -0000	1.6
@@ -80,3 +80,14 @@
  #else
  		m_aSettings.eType = AST_OTHER;
  #endif
+--- openoffice.org.orig/smoketestoo_native/data/Test_DB.xml	2010-07-16 18:26:49.000000000 +0100
++++ openoffice.org/smoketestoo_native/data/Test_DB.xml	2010-07-16 18:27:52.000000000 +0100
+@@ -53,7 +53,7 @@
+ 	sCurrentMessage = cMessageDatabaseService + " " + cUnoDatabaseContext
+ 	
+ 	oDBContext = CreateUnoService(cUnoDatabaseContext)
+-	sDBName=oDBContext.ElementNames(0) 'Names of Databases
++	sDBName="Bibliography"
+ 	
+ 	nCurrentAction = cDBOpen
+ 	sCurrentMessage = cMessageDatabaseOpen


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2290
retrieving revision 1.2291
diff -u -p -r1.2290 -r1.2291
--- openoffice.org.spec	16 Jul 2010 11:42:20 -0000	1.2290
+++ openoffice.org.spec	16 Jul 2010 17:30:12 -0000	1.2291
@@ -58,7 +58,6 @@ Source15:       http://hg.services.openo
 Source16:       http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 Source17:       http://hg.services.openoffice.org/binaries/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
 Source18:       http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 
-Source19:       smoketestdoc.sxw
 BuildRequires:  zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
 BuildRequires:  binutils, java-devel, boost-devel, zlib-devel, vigra-devel
 BuildRequires:  python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -1683,8 +1682,6 @@ cp %{SOURCE15} ext_sources
 cp %{SOURCE16} ext_sources
 cp %{SOURCE17} ext_sources
 cp %{SOURCE18} ext_sources
-#temp until smoketest built from source
-cp -f %{SOURCE19} smoketestoo_native/data/smoketestdoc.sxw
 
 ./bootstrap
 source ./Linux*Env.Set.sh


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -p -r1.409 -r1.410
--- sources	16 Jul 2010 11:42:21 -0000	1.409
+++ sources	16 Jul 2010 17:30:12 -0000	1.410
@@ -15,5 +15,4 @@ b54bcc9fdb23389e961b281508d9110c  docume
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 20613b42d66eadc11c719374355f745c  redhat-langpacks.tar.gz
 99bf42c02028cdaf6628356ca982bc65  redhat-registry.tar.gz
-971dc0d77bbec39d6049c7615ee449fa  smoketestdoc.sxw
 8f01ee56b0b4128fc5b655777c92b77d  OOO330_m1.tar.bz2