rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.65,1.66

[Lillian Angel (langel)]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3001

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Jun 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
- Removed freetype patch.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- java-1.6.0-openjdk.spec	25 Jul 2008 08:56:36 -0000	1.65
+++ java-1.6.0-openjdk.spec	28 Jul 2008 14:07:00 -0000	1.66
@@ -139,7 +139,6 @@
 Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
 Patch2: java-1.6.0-openjdk-makefile.patch
-Patch3:   java-1.6.0-openjdk-freetype.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -176,7 +175,7 @@
 BuildRequires: xorg-x11-server-Xvfb
 BuildRequires: xorg-x11-fonts-Type1
 BuildRequires: xorg-x11-fonts-misc
-BuildRequires: freetype-devel >= 2.2.0
+BuildRequires: freetype-devel >= 2.3.0
 BuildRequires: fontconfig
 BuildRequires: eclipse-ecj
 # Java Access Bridge for GNOME build requirements.
@@ -358,13 +357,7 @@
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
-pushd openjdk-ecj
-  patch -l -p2 < %{PATCH3}
-popd
 %endif
-make stamps/patch.stamp
-patch -l -p1 < %{PATCH3}
-
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -906,6 +899,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Jun 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
+- Removed freetype patch.
+
 * Wed Jul 23 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0-0.20.b11
 - Specify vendor for javaws desktop entry.
 - Merge EPEL-5 and Fedora devel packages.