rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec, 1.43, 1.44 java-1.6.0-openjdk-freetype.patch, 1.2, NONE

Thomas Fitzsimmons (fitzsim) fedora-extras-commits at redhat.com
Fri May 30 19:57:45 UTC 2008


Author: fitzsim

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

Modified Files:
	java-1.6.0-openjdk.spec 
Removed Files:
	java-1.6.0-openjdk-freetype.patch 
Log Message:
- Remove freetype version 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- java-1.6.0-openjdk.spec	30 May 2008 19:48:30 -0000	1.43
+++ java-1.6.0-openjdk.spec	30 May 2008 19:56:48 -0000	1.44
@@ -143,8 +143,7 @@
 # FIXME: The licenses in the jhat sources need to be fixed with proper
 # GPL headers.
 Patch2:   java-1.6.0-openjdk-jhat.patch
-Patch3:   java-1.6.0-openjdk-freetype.patch
-Patch4:	  java-1.6.0-openjdk-java-access-bridge-tck.patch
+Patch3:	  java-1.6.0-openjdk-java-access-bridge-tck.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -351,12 +350,10 @@
 make stamps/patch-ecj.stamp
 pushd openjdk-ecj
   patch -l -p1 < %{PATCH2}
-  patch -l -p2 < %{PATCH3}
 popd
 %endif
 make stamps/patch.stamp
 patch -l -p0 < %{PATCH2}
-patch -l -p1 < %{PATCH3}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image


--- java-1.6.0-openjdk-freetype.patch DELETED ---




More information about the fedora-extras-commits mailing list