rpms/openoffice.org/devel openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21418

Modified Files:
	openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch 
Log Message:
oops, if endif in wrong place

openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch:
 inc_openoffice/unix/packagelist.txt                                  |    0 
 instsetoo_native/inc_openoffice/unix/packagelist.txt                 |   12 +++++-----
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    7 -----
 registry/data/org/openoffice/Office/UI/GenericCommands.xcu           |    0 
 scp2/source/python/file_python.scp                                   |    2 -
 source/python/file_python.scp                                        |    0 
 6 files changed, 7 insertions(+), 14 deletions(-)

Index: openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch	18 Nov 2005 09:15:08 -0000	1.3
+++ openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch	18 Nov 2005 16:49:35 -0000	1.4
@@ -48,3 +48,26 @@
  End
  
  Start
+Index: source/python/file_python.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/python/file_python.scp,v
+retrieving revision 1.13
+diff -u -r1.13 file_python.scp
+--- openoffice.org.orig/scp2/source/python/file_python.scp	11 Nov 2005 10:43:22 -0000	1.13
++++ openoffice.org/scp2/source/python/file_python.scp	18 Nov 2005 16:48:39 -0000
+@@ -95,6 +95,7 @@
+     Styles = (PACKED);
+ End
+ #endif
++#endif
+ 
+ File gid_File_Pymailmerge
+     TXT_FILE_BODY;
+@@ -110,7 +111,6 @@
+     Name = "/registry/spool/org/openoffice/Office/Writer-javamail.xcu";
+     Styles = (PACKED,SCPZIP_REPLACE);
+ End
+-#endif
+ 
+ // substitute for the python Windows basic scripts
+