rpms/openoffice.org/devel openoffice.org.spec, 1.2271, 1.2272 workspace.sb128.patch, 1.1, NONE

[David Tardon]

Author: dtardon

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3102

Modified Files:
	openoffice.org.spec 
Removed Files:
	workspace.sb128.patch 
Log Message:
bah, that fix is 3.3 only. dropping again


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2271
retrieving revision 1.2272
diff -u -p -r1.2271 -r1.2272
--- openoffice.org.spec	7 Jul 2010 07:55:03 -0000	1.2271
+++ openoffice.org.spec	7 Jul 2010 08:20:09 -0000	1.2272
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%define rh_rpm_release 21
+%define rh_rpm_release 22
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -152,7 +152,6 @@ Patch81: openoffice.org-3.3.0.ooo112384.
 Patch82: workspace.gtkfpicker9.patch
 Patch83: workspace.gtk3.patch
 Patch84: workspace.sw33bf06.patch
-Patch85: workspace.sb128.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1718,7 +1717,6 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch82 -p0 -b .workspace.gtkfpicker9.patch
 %patch83 -p0 -b .workspace.gtk3.patch
 %patch84 -p0 -b .workspace.sw33bf06.patch
-%patch85 -p1 -b .workspace.sb128.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4371,6 +4369,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 07 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.22
+- drop workspace.sb128.patch again... it doesn't apply to 3.2 (dtardon)
+
 * Wed Jul 07 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.21
 - add workspace.sb128.patch workaround deadlock in smoketest (dtardon)
 


--- workspace.sb128.patch DELETED ---