rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk-freetype.patch, 1.2, 1.3 java-1.6.0-openjdk.spec, 1.16, 1.17

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4236

Modified Files:
	java-1.6.0-openjdk-freetype.patch java-1.6.0-openjdk.spec 
Log Message:
unfuck non-bootstrap builds

java-1.6.0-openjdk-freetype.patch:

Index: java-1.6.0-openjdk-freetype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk-freetype.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.6.0-openjdk-freetype.patch	28 Apr 2008 22:04:00 -0000	1.2
+++ java-1.6.0-openjdk-freetype.patch	28 Apr 2008 22:59:57 -0000	1.3
@@ -9,14 +9,3 @@
  
  #
  # Prune out all known SCM (Source Code Management) directories
---- icedtea6-1.0/openjdk-ecj/jdk/make/common/shared/Platform.gmk.orig	2008-04-13 18:01:30.000000000 +0200
-+++ icedtea6-1.0/openjdk-ecj/jdk/make/common/shared/Platform.gmk	2008-04-13 18:01:40.000000000 +0200
-@@ -94,7 +94,7 @@
- REQUIRED_BOOT_VER = 1.5
- 
- # If we are using freetype, this is the required version
--REQUIRED_FREETYPE_VERSION=2.3.0
-+REQUIRED_FREETYPE_VERSION=2.2.0
- 
- #
- # Prune out all known SCM (Source Code Management) directories


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- java-1.6.0-openjdk.spec	28 Apr 2008 22:04:00 -0000	1.16
+++ java-1.6.0-openjdk.spec	28 Apr 2008 22:59:57 -0000	1.17
@@ -353,6 +353,7 @@
 make stamps/patch-ecj.stamp
 pushd openjdk-ecj
   patch -l -p1 < %{PATCH2}
+  patch -l -p2 < %{PATCH3}
 popd
 %endif
 make stamps/patch.stamp