rpms/openoffice.org/devel openoffice.org.spec, 1.2054, 1.2055 workspace.impress178.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.impress178.patch 
Log Message:
drop integrated workspace.impress178.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2054
retrieving revision 1.2055
diff -u -p -r1.2054 -r1.2055
--- openoffice.org.spec	30 Oct 2009 11:46:52 -0000	1.2054
+++ openoffice.org.spec	30 Oct 2009 12:23:52 -0000	1.2055
@@ -118,10 +118,9 @@ Patch44: openoffice.org-3.2.0.ooo105827.
 Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
 Patch47: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch48: workspace.impress178.patch
-Patch49: workspace.impress180.patch
-Patch50: workspace.gsminhibit.patch
-Patch51: workspace.vcl107.patch
+Patch48: workspace.impress180.patch
+Patch49: workspace.gsminhibit.patch
+Patch50: workspace.vcl107.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1629,10 +1628,9 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
 %patch47 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch48 -p0 -b .workspace.impress178.patch
-%patch49 -p0 -b .workspace.impress180.patch
-%patch50 -p1 -b .workspace.gsminhibit.patch
-%patch51 -p1 -b .workspace.vcl107.patch
+%patch48 -p0 -b .workspace.impress180.patch
+%patch49 -p1 -b .workspace.gsminhibit.patch
+%patch50 -p1 -b .workspace.vcl107.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4134,8 +4132,9 @@ fi
 
 %changelog
 * Fri Oct 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-3.1
-- Resolves: rhbz#531732 possible crash in about dialog with unfinished
+- Resolves: rhbz#531732 crash in about dialog with unfinished
   accelerator sequence
+- drop integrated workspace.impress178.patch
 - next milestone
 
 * Wed Oct 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.5


--- workspace.impress178.patch DELETED ---