SPECS: openoffice.org.spec - removed obsolete pld,filter patches

[qboosh]

Author: qboosh                       Date: Sun Dec 25 15:00:18 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed obsolete pld,filter patches

---- Files affected:
SPECS:
   openoffice.org.spec (1.568 -> 1.569) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.568 SPECS/openoffice.org.spec:1.569
--- SPECS/openoffice.org.spec:1.568	Sun Dec 25 15:14:28 2005
+++ SPECS/openoffice.org.spec	Sun Dec 25 16:00:11 2005
@@ -141,14 +141,10 @@
 # Source411-md5:	3b00571318e45965dee0545d86306d65
 Source412:	%{cftp}/helpcontent/helpcontent_90_unix.tgz
 # Source412-md5:	9521a01c5817e87178f356762f8cdab5
-
-Patch0:		%{name}-pld.patch
-Patch1:		%{name}-STL-lib64.diff
-Patch2:		%{name}-filter.patch
-Patch3:		buildfix-64bit-sc.diff
-Patch4:		%{name}-desktop.patch
-Patch5:		%{name}-gcc4.diff
-
+Patch0:		%{name}-STL-lib64.diff
+Patch1:		buildfix-64bit-sc.diff
+Patch2:		%{name}-desktop.patch
+Patch3:		%{name}-gcc4.diff
 URL:		http://www.openoffice.org/
 BuildRequires:	ImageMagick
 BuildRequires:	STLport-devel >= 4.5.3-6
@@ -1653,9 +1649,7 @@
 
 %prep
 %setup -q -n ooo-build-%{ooobver}
-#%patch0 -p1
-#%patch2 -p1
-%patch4 -p1
+%patch2 -p1
 
 install -d src
 # sources, icons, KDE_icons
@@ -1668,10 +1662,10 @@
 	%{SOURCE410} %{SOURCE411} %{SOURCE412} src
 
 # add to ooo-build patch-system
-install %{PATCH1} patches/src680
-install %{PATCH3} patches/64bit
-install %{PATCH5} patches/src680
-(echo "[ Fixes ]"; echo `basename %{PATCH5}`) >>patches/OOO_2_0/apply
+install %{PATCH0} patches/src680
+install %{PATCH1} patches/64bit
+install %{PATCH3} patches/src680
+(echo "[ Fixes ]"; echo `basename %{PATCH3}`) >>patches/OOO_2_0/apply
 # fake patch to make buildsystem happy (patch is included)
 touch patches/64bit/cws-ooo64bit02.2005-04-19-math-h.diff
 
@@ -2269,6 +2263,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.569  2005/12/25 15:00:11  qboosh
+- removed obsolete pld,filter patches
+
 Revision 1.568  2005/12/25 14:14:28  qboosh
 - use x8664 macro
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.568&r2=1.569&f=u