rpms/openoffice.org/devel openoffice.org.spec, 1.1459, 1.1460 workspace.cairotext01.patch, 1.7, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7403

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.cairotext01.patch 
Log Message:
much better


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1459
retrieving revision 1.1460
diff -u -r1.1459 -r1.1460
--- openoffice.org.spec	28 Mar 2008 12:03:10 -0000	1.1459
+++ openoffice.org.spec	28 Mar 2008 12:48:37 -0000	1.1460
@@ -127,17 +127,16 @@
 Patch54: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 Patch55: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
 Patch56: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch57: workspace.cairotext01.patch
-Patch58: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch59: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch60: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch61: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch62: workspace.cmcfixes43.patch
-Patch63: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch64: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
-Patch65: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch66: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch67: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch57: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch58: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch59: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch60: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch61: workspace.cmcfixes43.patch
+Patch62: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch63: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+Patch64: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch65: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch66: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1079,7 +1078,7 @@
 %patch24 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
 %patch25 -p1 -b .ooo65491.psprint.enablenups.patch
 cat %{PATCH26} >> svtools/source/dialogs/localize.sdf
-%patch27 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
+#%patch27 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
 %patch28 -p1 -b .rh217269.officecfg.nosequencecheck.patch
 %patch29 -p1 -b .tl37.patch
 %patch30 -p1 -b .ooo73201.sw.a11yloadcrash.patch
@@ -1109,17 +1108,16 @@
 %patch54 -p1 -b .rh133741.alwaysgtk.vcl.patch
 %patch55 -p1 -b .ooo85429.sw.a11ycrash.patch
 %patch56 -p1 -b .ooo85448.emptyrpath.patch
-%patch57 -p1 -b .workspace.cairotext01.patch
-%patch58 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch59 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch60 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch61 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch62 -p1 -b .workspace.cmcfixes43.patch
-%patch63 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch64 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
-%patch65 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch66 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch67 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch57 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch58 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch59 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch60 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch61 -p1 -b .workspace.cmcfixes43.patch
+%patch62 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch63 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
+%patch64 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch65 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch66 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2126,9 +2124,13 @@
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Embedding
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/AutoSaveCommon.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery/AutoSaveRecovery.xcu
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Setup
 %{basisinstdir}/share/registry/modules/org/openoffice/Setup/Langpack-en-US.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/Setup/RegisterAndLicence.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/Setup/Setup-start.xcu
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
@@ -2858,7 +2860,9 @@
 
 %changelog
 * Fri Mar 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.1
+- drop integrated workspace.cairotext01.patch
 - fix up launchers
+- recover most configuration settings
 
 * Tue Mar 27 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
 - extend selinux bodge to ia64 


--- workspace.cairotext01.patch DELETED ---