SPECS (AC-branch): openoffice.org.spec - use ooo build for java6 p...

[glen]

Author: glen                         Date: Wed Feb 28 23:17:33 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use ooo build for java6 patch; rel 2

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.3 -> 1.704.2.4) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.3 SPECS/openoffice.org.spec:1.704.2.4
--- SPECS/openoffice.org.spec:1.704.2.3	Wed Feb 28 23:04:50 2007
+++ SPECS/openoffice.org.spec	Thu Mar  1 00:17:26 2007
@@ -67,7 +67,7 @@
 %endif
 
 %define		ver		2.1.0
-%define		_rel		1
+%define		_rel		2
 %define		subver		680
 %define		snap		OOE680
 %define		snap2		SRC680
@@ -120,7 +120,6 @@
 Patch4:		%{name}-nolfs_hack.patch
 Patch5:		%{name}-no_fonts_dir_buildfix.patch
 Patch6:		%{name}-java16.patch
-Patch7:		%{name}-java6.patch
 # patches applied by ooo-patching-system
 Patch100:	%{name}-STL-lib64.diff
 Patch101:	%{name}-64bit-inline.diff
@@ -128,6 +127,7 @@
 Patch104:	%{name}-portaudio_v19.diff
 Patch106:	%{name}-seamonkey.diff
 Patch107:	%{name}-stl-amd64.patch
+Patch108:	%{name}-java6.patch
 URL:		http://www.openoffice.org/
 BuildRequires:	STLport-devel >= 2:5.0.0
 BuildRequires:	autoconf >= 2.51
@@ -2026,7 +2026,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 # 64 bit related patches (not applied now)
 install %{PATCH100} patches/64bit
@@ -2045,7 +2044,7 @@
 
 echo "[ PLDOnly ]" >> patches/src680/apply
 # patches applied by ooo (extension .diff is required)
-for P in %{PATCH102} %{PATCH104} %{PATCH106}; do
+for P in %{PATCH102} %{PATCH104} %{PATCH106} %{PATCH108}; do
 	PATCHNAME=PLD-${P##*/%{name}-}
 	PATCHNAME=${PATCHNAME%.patch}.diff
 	install $P patches/src680/$PATCHNAME
@@ -3762,6 +3761,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.4  2007/02/28 23:17:26  glen
+- use ooo build for java6 patch; rel 2
+
 Revision 1.704.2.3  2007/02/28 22:04:50  glen
 - still try with java-1.6
 
================================================================

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