rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-freetype.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 java-1.6.0-openjdk.spec, 1.27, 1.28 sources, 1.18, 1.19

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Added Files:
	java-1.6.0-openjdk-freetype.patch 
Log Message:
* Mon Apr 28 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:1.6.0.0-0.12.b08
- Merge changes made to build on Red Hat Enterprise Linux 5, to include in EPEL:
- Require Freetype 2.2.0 instead of 2.3.0
- Build against openmotif instead of lesstif when not on Fedora

java-1.6.0-openjdk-freetype.patch:

--- NEW FILE java-1.6.0-openjdk-freetype.patch ---
--- icedtea6-1.0.orig/openjdk/jdk/make/common/shared/Platform.gmk	2008-03-19 11:15:29.000000000 +0100
+++ icedtea6-1.0/openjdk/jdk/make/common/shared/Platform.gmk	2008-03-19 11:15:11.000000000 +0100
@@ -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
--- 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	28 Apr 2008 14:26:51 -0000	1.19
+++ .cvsignore	28 Apr 2008 22:00:27 -0000	1.20
@@ -1,5 +1,5 @@
-mauve_tests
+icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz
 java-access-bridge-1.22.0.tar.gz
 mauve-2008-03-11.tar.gz
+mauve_tests
 openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
-icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz


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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- java-1.6.0-openjdk.spec	28 Apr 2008 17:58:56 -0000	1.27
+++ java-1.6.0-openjdk.spec	28 Apr 2008 22:00:27 -0000	1.28
@@ -106,7 +106,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.11.%{openjdkver}%{?dist}
+Release: 0.12.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -141,6 +141,7 @@
 # FIXME: The licenses in the jhat sources need to be fixed with proper 
 # GPL Licenses.
 Patch2:   java-1.6.0-openjdk-jhat.patch
+Patch3:   java-1.6.0-openjdk-freetype.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -148,7 +149,11 @@
 BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 BuildRequires: giflib-devel
+%if %{?fedora}0
 BuildRequires: lesstif-devel
+%else
+BuildRequires: openmotif-devel
+%endif
 BuildRequires: libX11-devel
 BuildRequires: libXi-devel
 BuildRequires: libXp-devel
@@ -172,7 +177,7 @@
 BuildRequires: xorg-x11-server-Xvfb
 BuildRequires: xorg-x11-fonts-Type1
 BuildRequires: xorg-x11-fonts-misc
-BuildRequires: freetype-devel >= 2.3.0
+BuildRequires: freetype-devel >= 2.2.0
 BuildRequires: fontconfig
 # Java Access Bridge for GNOME build requirements.
 BuildRequires: at-spi-devel
@@ -352,6 +357,7 @@
 %endif
 make stamps/patch.stamp
 patch -l -p0 < %{PATCH2}
+patch -l -p1 < %{PATCH3}
 make
 pushd java-access-bridge-%{accessver}
   export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
@@ -854,6 +860,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Apr 28 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:1.6.0.0-0.12.b08
+- Merge changes made to build on Red Hat Enterprise Linux 5, to include in EPEL:
+- Require Freetype 2.2.0 instead of 2.3.0
+- Build against openmotif instead of lesstif when not on Fedora
+
 * Mon Apr 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.11.b09
 - Fixed javaws.desktop and javaws.png installation.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	28 Apr 2008 14:26:51 -0000	1.18
+++ sources	28 Apr 2008 22:00:27 -0000	1.19
@@ -1,5 +1,5 @@
-7a0c160c03012cd40957a7a112e25038  mauve_tests
+f0dc22fdc707f4ef5ff6b1ee113ac6a1  icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz
 11d8e6129f27792cc1b0e1a7de2ec127  java-access-bridge-1.22.0.tar.gz
 079e5dc01f2a8720ee3b3dd39119a601  mauve-2008-03-11.tar.gz
+7a0c160c03012cd40957a7a112e25038  mauve_tests
 ad07a6bf24f81f49b4a8abef03676dd6  openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
-f0dc22fdc707f4ef5ff6b1ee113ac6a1  icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz