rpms/openoffice.org/devel workspace.cmcfixes48.patch,1.6,1.7

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28862

Modified Files:
	workspace.cmcfixes48.patch 
Log Message:
messy

workspace.cmcfixes48.patch:

Index: workspace.cmcfixes48.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes48.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.cmcfixes48.patch	30 Nov 2008 23:05:59 -0000	1.6
+++ workspace.cmcfixes48.patch	1 Dec 2008 08:25:11 -0000	1.7
@@ -147,27 +147,6 @@
 diff -u installation/scp2/source/ooo/file_library_ooo.scp:1.302 installation/scp2/source/ooo/file_library_ooo.scp:1.302.14.1
 --- installation/scp2/source/ooo/file_library_ooo.scp:1.302	Thu Jul 17 08:34:36 2008
 +++ installation/scp2/source/ooo/file_library_ooo.scp	Fri Aug  1 07:08:01 2008
-@@ -1104,6 +1104,20 @@
-     Name = "oleautobridge.uno.dll";
- End
- 
-+#else
-+
-+File gid_File_Lib_Mozbootstrap
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,UNO_COMPONENT,PATCH);
-+    RegistryID = gid_Starregistry_Services_Rdb;
-+    Dir = gid_Dir_Program;
-+  #ifdef UNX
-+    Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
-+  #else
-+    Name = "libmozbootstrap.dll";
-+  #endif
-+End
-+
- #endif
- 
- SPECIAL_UNO_LIB_FILE(gid_File_Lib_Package2,package2)
 @@ -1657,26 +1671,18 @@
      RegistryID = gid_Starregistry_Services_Rdb;
  End