rpms/openoffice.org/devel openoffice.org.spec, 1.1259, 1.1260 openoffice.org-2.3.0.ooo80722.sw.stlportism.patch, 1.1, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.0.ooo80722.sw.stlportism.patch 
Log Message:
remove integrated patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1259
retrieving revision 1.1260
diff -u -r1.1259 -r1.1260
--- openoffice.org.spec	21 Aug 2007 09:56:23 -0000	1.1259
+++ openoffice.org.spec	21 Aug 2007 10:54:01 -0000	1.1260
@@ -126,10 +126,9 @@
 Patch61: workspace.unifysound01.patch
 Patch62: libtextcat.xcu
 Patch63: workspace.npower7.patch
-Patch64: openoffice.org-2.3.0.ooo80722.sw.stlportism.patch
-Patch65: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch66: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch67: openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch
+Patch64: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+Patch65: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch66: openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1059,10 +1058,9 @@
 tar xzf %{PATCH60}
 %patch61 -p1 -b .workspace.unifysound01.patch
 %patch63 -p1 -b .workspace.npower7.patch
-%patch64 -p1 -b .ooo80722.sw.stlportism.patch
-%patch65 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch66 -p1 -b .ooo80735.cppu.map.patch
-%patch67 -p1 -b .oooXXXXX.sd.sixtyfour.patch
+%patch64 -p1 -b .ooo80721.reportdesign.stlportism.patch
+%patch65 -p1 -b .ooo80735.cppu.map.patch
+%patch66 -p1 -b .oooXXXXX.sd.sixtyfour.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2729,7 +2727,6 @@
   + large file support upstreamed
   + add libtextcat.xcu -> reuse libtextcat fingerprints
   + add workspace.npower7.patch for build failure
-  + add openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch for build failure
   + add openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch for build failure
   + add openoffice.org-2.3.0.ooo80735.cppu.map.patch for ppc64
   + add openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch


--- openoffice.org-2.3.0.ooo80722.sw.stlportism.patch DELETED ---