rpms/openoffice.org/devel openoffice.org.spec, 1.2119, 1.2120 workspace.impress184.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-serv647

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.impress184.patch 
Log Message:
drop integrated workspace.impress184.patch (caolanm)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2119
retrieving revision 1.2120
diff -u -p -r1.2119 -r1.2120
--- openoffice.org.spec	11 Jan 2010 08:20:37 -0000	1.2119
+++ openoffice.org.spec	11 Jan 2010 08:53:12 -0000	1.2120
@@ -118,15 +118,14 @@ Patch42: workspace.hb33patches1.patch
 Patch43: workspace.ause109.patch
 Patch44: workspace.cmcfixes67.patch
 Patch45: workspace.srb1.patch
-Patch46: workspace.impress184.patch
-Patch47: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch48: openoffice.org-3.3.0.ooo102645.fix.es.patch
-Patch49: workspace.vcl108.patch
-Patch50: workspace.pythonssldedux.patch
-Patch51: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch52: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
-Patch53: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
-Patch54: openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch
+Patch46: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
+Patch47: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch48: workspace.vcl108.patch
+Patch49: workspace.pythonssldedux.patch
+Patch50: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch51: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch52: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
+Patch53: openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1672,15 +1671,14 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch43 -p0 -b .workspace.ause109.patch
 %patch44 -p1 -b .workspace.cmcfixes67.patch
 %patch45 -p1 -b .workspace.srb1.patch
-%patch46 -p0 -b .workspace.impress184.patch
-%patch47 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch48 -p0 -b .ooo102645.fix.es.patch
-%patch49 -p0 -b .workspace.vcl108.patch
-%patch50 -p1 -b .workspace.pythonssldedux.patch
-%patch51 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch52 -p0 -b .ooo47279.sd.objectsave.safe.patch
-%patch53 -p0 -b .ooo107834.sw.pseudoattribs.patch
-%patch54 -p1 -b .ooo108047.writerfilter.safer-field-context-handling.patch
+%patch46 -p0 -b .ooo107137.canvas.fixcolorspace.patch
+%patch47 -p0 -b .ooo102645.fix.es.patch
+%patch48 -p0 -b .workspace.vcl108.patch
+%patch49 -p1 -b .workspace.pythonssldedux.patch
+%patch50 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch51 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch52 -p0 -b .ooo107834.sw.pseudoattribs.patch
+%patch53 -p1 -b .ooo108047.writerfilter.safer-field-context-handling.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2005,9 +2003,9 @@ popd
 #Set some aliases to canonical autocorrect language files for locales with matching languages
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr
 
-#ooo#105600
+# ooo#105600
 cp -p %{SOURCE10} acor_ga-IE.dat
-# i108049
+# ooo#108049
 cp -p %{SOURCE12} acor_lt-LT.dat
 
 #en-ZA exists and has a good autocorrect file with two or three extras that make sense for South Africa
@@ -4165,6 +4163,7 @@ fi
 %changelog
 * Mon Jan 11 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-9.2
 - Resolves: rhbz#554259 No autocorrect files for Lithuanian (dtardon)
+- drop integrated workspace.impress184.patch (caolanm)
 
 * Sun Jan 10 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-9.1
 - latest milestone


--- workspace.impress184.patch DELETED ---