rpms/openoffice.org/devel workspace.qwizardsbfooo20.patch, NONE, 1.1 openoffice.org.spec, 1.322, 1.323

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.qwizardsbfooo20.patch 
Log Message:
rh#163554#

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/devel/openoffice.org.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- openoffice.org.spec	18 Jul 2005 08:47:53 -0000	1.322
+++ openoffice.org.spec	19 Jul 2005 08:21:04 -0000	1.323
@@ -164,6 +164,7 @@
 Patch63: openoffice.org-1.9.117.oooXXXXX.mozillanspr.extensions.patch
 Patch64: openoffice.org-1.9.118.forwarddecl.psprint.patch
 Patch65: openoffice.org-1.9.118.ooo52061.recursive.animations.patch
+Patch66: workspace.qwizardsbfooo20.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -814,6 +815,7 @@
 %patch63 -p1 -b .oooXXXXX.mozillanspr.extensions.patch
 %patch64 -p1 -b .forwarddecl.psprint.patch
 %patch65 -p1 -b .ooo52061.recursive.animations.patch
+%patch66 -p1 -R -b .workspace.qwizardsbfooo20.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3019,6 +3021,7 @@
 - add experiemental rh150643.fontconfigalwayssystemfont.vcl.patch
 - drop integrated workspace.impress63.patch
 - drop integrated workspace.mh19104.patch
+- rh#163554# due to #i41296# missing FormWizard stuff
 
 * Fri Jul 15 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.117-2
 - add openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch to