SPECS (AC-branch): openoffice.org.spec - drop 64bit related patches

adamg adamg at pld-linux.org
Sun Aug 6 20:50:04 CEST 2006


Author: adamg                        Date: Sun Aug  6 18:50:04 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- drop 64bit related patches

---- Files affected:
SPECS:
   openoffice.org.spec (1.605.2.1 -> 1.605.2.2) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.605.2.1 SPECS/openoffice.org.spec:1.605.2.2
--- SPECS/openoffice.org.spec:1.605.2.1	Sun Aug  6 20:42:25 2006
+++ SPECS/openoffice.org.spec	Sun Aug  6 20:49:59 2006
@@ -82,11 +82,9 @@
 Source51:	openintro_pld.bmp
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-vendorname.patch
-Patch100:	%{name}-STL-lib64.diff
-Patch101:	%{name}-64bit-inline.diff
-Patch102:	%{name}-build-pld-splash.diff
-Patch103:	%{name}-sfx2.badscript.diff
-Patch104:	%{name}-i66982.diff
+Patch101:	%{name}-build-pld-splash.diff
+Patch102:	%{name}-sfx2.badscript.diff
+Patch103:	%{name}-i66982.diff
 URL:		http://www.openoffice.org/
 BuildRequires:	ImageMagick
 BuildRequires:	STLport-devel >= 4.5.3-6
@@ -1772,18 +1770,14 @@
 # teach configure.in about PLD
 %patch1 -p1
 
-# 64 bit related patches
-install %{PATCH100} patches/64bit
-install %{PATCH101} patches/64bit/64bit-inline.diff
-
 # fix patches/src680/pld-splash.diff
-install %{PATCH102} patches/src680/pld-splash.diff
+install %{PATCH101} patches/src680/pld-splash.diff
 
 # macro browser can crash if there's an invalid script container
-install %{PATCH103} patches/src680/sfx2.badscript.diff
+install %{PATCH102} patches/src680/sfx2.badscript.diff
 
 # fix build of sal project
-install %{PATCH104} patches/src680/unxlngi4.mk_linker.diff
+install %{PATCH103} patches/src680/unxlngi4.mk_linker.diff
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -2326,6 +2320,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.605.2.2  2006/08/06 18:49:59  adamg
+- drop 64bit related patches
+
 Revision 1.605.2.1  2006/08/06 18:42:25  adamg
 - updated to m180 snap
 - java support enabled by default
================================================================

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



More information about the pld-cvs-commit mailing list