rpms/openoffice.org/devel .cvsignore, 1.213, 1.214 openoffice.org.spec, 1.1856, 1.1857

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec 
Log Message:
drop extra patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- .cvsignore	12 Mar 2009 11:32:07 -0000	1.213
+++ .cvsignore	12 Mar 2009 11:56:19 -0000	1.214
@@ -6,15 +6,5 @@
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
 openoffice.org-javafilter.desktop
-GSI_fi.sdf.gz
 or-IN_DEV300_m40.sdf
-mr-IN_DEV300_m40.sdf
-te-IN_DEV300_m40.sdf
-kn-IN_DEV300_m40.sdf
-hi-IN-D300-m40.tar.gz
-Maithili-mai-ooo3.0.sdf.tar.gz
-as-IN_DEV300_m40.sdf
-ta-090227.sdf
-Openoffice3.1-300m40-100per.tar.bz2
-ml-IN_DEV300_m40.sdf
 OOO310_m5.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1856
retrieving revision 1.1857
diff -u -r1.1856 -r1.1857
--- openoffice.org.spec	12 Mar 2009 11:54:08 -0000	1.1856
+++ openoffice.org.spec	12 Mar 2009 11:56:19 -0000	1.1857
@@ -127,9 +127,8 @@
 Patch52: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 Patch53: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch55: workspace.localization35.patch
-Patch56: workspace.cl12.patch
-Patch57: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
+Patch55: workspace.cl12.patch
+Patch56: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1608,9 +1607,8 @@
 %patch52 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch53 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch55 -p0 -b .workspace.localization35.patch
-%patch56 -p0 -b .workspace.cl12.patch
-%patch57 -p1 -b .gccXXXXX.sw.typeillness.patch
+%patch55 -p0 -b .workspace.cl12.patch
+%patch56 -p1 -b .gccXXXXX.sw.typeillness.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`