rpms/openoffice.org/FC-4 workspace.qwizardsbfooo20.patch, NONE, 1.1 openoffice.org.spec, 1.207, 1.208

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.qwizardsbfooo20.patch 
Log Message:
add patch to avoid FormWizard spam

workspace.qwizardsbfooo20.patch:
 directory_ooo.scp |    5 -----
 file_ooo.scp      |    6 ------
 2 files changed, 11 deletions(-)

--- NEW FILE workspace.qwizardsbfooo20.patch ---
Index: source/ooo/directory_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/directory_ooo.scp,v
retrieving revision 1.29
retrieving revision 1.29.50.1
diff -u -p -u -r1.29 -r1.29.50.1
--- openoffice.org.orig/scp2/source/ooo/directory_ooo.scp	20 May 2005 15:46:58 -0000	1.29
+++ openoffice.org/scp2/source/ooo/directory_ooo.scp	28 Jun 2005 13:26:18 -0000	1.29.50.1
@@ -882,11 +882,6 @@ Directory gid_Dir_Basic_Euro
     DosName = "Euro";
 End
 
-Directory gid_Dir_Basic_Formwizard
-    ParentID = gid_Dir_Basic;
-    DosName = "FormWizard";
-End
-
 Directory gid_Dir_Basic_Gimmicks
     ParentID = gid_Dir_Basic;
     DosName = "Gimmicks";
Index: source/ooo/file_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
retrieving revision 1.90
retrieving revision 1.90.4.1
diff -u -p -u -r1.90 -r1.90.4.1
--- openoffice.org.orig/scp2/source/ooo/file_ooo.scp	24 May 2005 14:00:27 -0000	1.90
+++ openoffice.org/scp2/source/ooo/file_ooo.scp	28 Jun 2005 13:26:19 -0000	1.90.4.1
@@ -70,12 +70,6 @@ File gid_File_Basic_Euro
     Name = "basicsrveuro.zip";
 End
 
-File gid_File_Basic_Form
-    Dir = gid_Dir_Basic_Formwizard;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvform.zip";
-End
-
 File gid_File_Basic_Gimmicks
     Dir = gid_Dir_Basic_Gimmicks;
     ARCHIVE_TXT_FILE_BODY;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- openoffice.org.spec	17 Jul 2005 16:59:06 -0000	1.207
+++ openoffice.org.spec	19 Jul 2005 08:22:40 -0000	1.208
@@ -1,5 +1,5 @@
 %define ooo2ver 117
-%define ooo_rpm_release 2
+%define ooo_rpm_release 3
 %define build_fc4 1
 %define build_fc5 0
 
@@ -161,6 +161,7 @@
 Patch61: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
 Patch62: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
 Patch63: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
+Patch64: workspace.qwizardsbfooo20.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -806,6 +807,7 @@
 %patch61 -p1 -b .ooo51912.nullpointer.wizards.patch
 %patch62 -p1 -b .ooo52023.evoadb2.nognuconst.patch
 %patch63 -p1 -b .ooo52048.inhalt.sw.patch
+%patch64 -p1 -R -b .workspace.qwizardsbfooo20.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3007,6 +3009,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Jul 19 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.117-3
+- add workspace.qwizardsbfooo20.patch to avoid missing FormWizard spam
+on save
+
 * Fri Jul 15 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.117-2
 - add openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch to
   fix evoab2