[java-1.7.0-openjdk/f18] updated to icedtea7 2.3.11, removed 2.1 arm sources (arm now have 2.3.x too)

jiri vanek jvanek at fedoraproject.org
Thu Jul 25 12:54:17 UTC 2013 

commit 637f081d18f6cb63dbe9de95e53a132c7c22fa44
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Thu Jul 25 14:53:52 2013 +0200

    updated to icedtea7 2.3.11, removed 2.1 arm sources (arm now have 2.3.x too)

 .gitignore                         |    3 +
 java-1.7.0-openjdk-arm-fixes.patch |   22 -----
 java-1.7.0-openjdk.spec            |   70 +++++-----------
 rhino-icedtea-2.1.1.patch          |  157 ------------------------------------
 sources                            |    3 +-
 5 files changed, 25 insertions(+), 230 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0ba060..b69b151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,9 +27,12 @@
 /openjdk-icedtea-2.1.6.tar.gz
 /openjdk-icedtea-2.3.7.tar.gz
 /openjdk-icedtea-2.3.8.tar.gz
+/java-access-bridge-1.26.2.tar.gz
+/java-access-bridge-1.26.2.tar.bz2
 /openjdk-icedtea-2.3.9.tar.gz
 /openjdk-icedtea-2.1.8.tar.gz
 /openjdk-icedtea-2.3.10.tar.gz
 /openjdk-icedtea-2.1.9.tar.gz
 /openjdk-icedtea-2.1.9.tar.xz
 /openjdk-icedtea-2.3.10.tar.xz
+/openjdk-icedtea-2.3.11.tar.xz
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 00c948f..08c1cea 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -6,7 +6,7 @@
 # If debug is 1, OpenJDK is built with all debug info present.
 %global debug 0
 
-%global icedtea_version 2.3.10
+%global icedtea_version 2.3.11
 %global hg_tag icedtea-{icedtea_version}
 
 %global accessmajorver 1.23
@@ -14,13 +14,10 @@
 %global accessver %{accessmajorver}.%{accessminorver}
 %global accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
+%global aarch64			aarch64 arm64 armv8
+%global multilib_arches %{power64} sparc64 x86_64 %{aarch64}
+%global jit_arches		%{ix86} x86_64 sparcv9 sparc64
 
-%global multilib_arches ppc64 sparc64 x86_64
-
-%global jit_arches %{ix86} x86_64 sparcv9 sparc64
-#this is even greater restriction then jit archs. It should have all modifications 
-#as jit_archs, and as addition also using 2.1 source
-%global arm_arches armv5tel armv7hl
 
 %ifarch x86_64
 %global archbuild amd64
@@ -31,7 +28,7 @@
 %global archinstall ppc
 %global archdef PPC
 %endif
-%ifarch ppc64
+%ifarch %{power64}
 %global archbuild ppc64
 %global archinstall ppc64
 %global archdef PPC
@@ -59,6 +56,11 @@
 %global archinstall arm
 %global archdef ARM
 %endif
+%ifarch %{aarch64}
+%global archbuild aarch64
+%global archinstall aarch64
+%global archdef AARCH64
+%endif
 # 32 bit sparc, optimized for v9
 %ifarch sparcv9
 %global archbuild sparc
@@ -157,7 +159,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.7%{?dist}
+Release: %{icedtea_version}.0%{?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
@@ -231,12 +233,6 @@ Source9: pulseaudio.tar.gz
 # Removed libraries that we link instead
 Source10: remove-intree-libraries.sh
 
-# For primary arches, build latest and for arm, use hs22
-# http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
-# hg tag: icedtea-2.1.9
-# otherwise procedure same as for main tarball
-Source100:  openjdk-icedtea-2.1.9.tar.xz
-
 # RPM/distribution specific patches
 
 # Allow TCK to pass with access bridge wired in
@@ -268,9 +264,6 @@ Patch102: %{name}-size_t.patch
 # Disable system LCMS as 2.3.10 security release have fixes for it
 Patch500:  %{name}-disable-system-lcms.patch
 
-# Patches for Arm
-Patch103: %{name}-arm-fixes.patch
-
 # Patch for PPC/PPC64
 Patch104: %{name}-ppc-zero-jdk.patch
 Patch105: %{name}-ppc-zero-hotspot.patch
@@ -407,13 +400,6 @@ Patch300: pulse-soundproperties.patch
 # Workaround for RH613824
 Patch302: systemtap.patch
 
-#
-# IcedTea 2.1.1/hs22 specific patches
-#
-
-# Rhino support
-Patch400: rhino-icedtea-2.1.1.patch
-
 #Workaround RH947731
 Patch401: 657854-openjdk7.patch
 #Workaround RH902004
@@ -473,7 +459,7 @@ BuildRequires: libffi-devel >= 3.0.10
 BuildRequires: openssl
 # execstack build requirement.
 # no prelink on ARM yet
-%ifnarch %{arm}
+%ifnarch %{arm} %{aarch64}
 BuildRequires: prelink
 %endif
 %ifarch %{jit_arches}
@@ -588,25 +574,14 @@ Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release}
 The OpenJDK API documentation.
 
 %prep
-
-%ifarch %{arm_arches}
-%global source_num 100
-%else
-%global source_num 0
-%endif
-
-%setup -q -c -n %{uniquesuffix} -T -a %{source_num}
+%setup -q -c -n %{uniquesuffix} -T -a 0
 %setup -q -n %{uniquesuffix} -T -D -a 1
 cp %{SOURCE2} .
 
 # OpenJDK patches
 
 # Rhino patch -- one default version (100) and one specific to 2.1.1 (400)
-%ifarch %{arm_arches}
-%patch400
-%else
 %patch100
-%endif
 
 # pulseaudio support
 %if %{with_pulseaudio}
@@ -728,11 +703,6 @@ patch -l -p0 < %{PATCH101}
 patch -l -p0 < %{PATCH102}
 %endif
 
-# Arm fixes
-%ifarch %{arm}
-patch -l -p0 < %{PATCH103}
-%endif
-
 # Disable system LCMS2
 patch -l -p0 < %{PATCH500}
 
@@ -897,11 +867,7 @@ make \
   ANT="/usr/bin/ant" \
   DISTRO_NAME="Fedora" \
   DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
-%ifarch %{arm_arches}
-  JDK_UPDATE_VERSION="03" \
-%else
   JDK_UPDATE_VERSION=`printf "%02d" %{buildver}` \
-%endif
   MILESTONE="fcs" \
   HOTSPOT_BUILD_JOBS="$NUM_PROC" \
   STATIC_CXX="false" \
@@ -1412,9 +1378,7 @@ exit 0
 %{_mandir}/man1/javah-%{uniquesuffix}.1*
 %{_mandir}/man1/javap-%{uniquesuffix}.1*
 %{_mandir}/man1/jconsole-%{uniquesuffix}.1*
-%ifnarch %{arm_arches} # Only in u4+
 %{_mandir}/man1/jcmd-%{uniquesuffix}.1*
-%endif
 %{_mandir}/man1/jdb-%{uniquesuffix}.1*
 %{_mandir}/man1/jhat-%{uniquesuffix}.1*
 %{_mandir}/man1/jinfo-%{uniquesuffix}.1*
@@ -1452,6 +1416,14 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Thu Jul 25 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.11.0.f18
+- finally merged arm and main source tarballs
+- updated to icedtea 2.3.11
+ - http://blog.fuseyism.com/index.php/2013/07/25/icedtea-2-3-11-released/
+- removed patch 400, rhino for 2.1 and other 2.1 conditional stuff
+- removed patch 103 arm-fixes.patch
+- removed arm_arches variable in favour of standart arm one
+
 * Wed Jul 03 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.10.7.f18
 - moved to xz compression of sources
 - updated 2.1 tarball
diff --git a/sources b/sources
index ed31dc7..898219e 100644
--- a/sources
+++ b/sources
@@ -4,5 +4,4 @@ ea344cc5b53b73f375558ba41760ff64  class-rewriter.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
 1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
 8eb5ad93dbf2f4fe86e52631969cfb09  systemtap-tapset.tar.gz
-4f13bd7d359d8a10105d748de3e7ed6f  openjdk-icedtea-2.1.9.tar.xz
-646089f29ea60334cfd3814f834530c2  openjdk-icedtea-2.3.10.tar.xz
+dd2b48baa5c51f165330191ad3144bd4  openjdk-icedtea-2.3.11.tar.xz

More information about the scm-commits mailing list