[java-1.7.0-openjdk] updated to icedtea7 2.3.11, removed 2.1 arm sources (arm now have 2.3.x too), added 2 new alternativ

jiri vanek jvanek at fedoraproject.org
Thu Jul 25 12:52:00 UTC 2013 

commit fe1fa7e74f379eeefd76f208a3b35cbc0cd269eb
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Thu Jul 25 14:50:30 2013 +0200

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

 .gitignore                         |    1 +
 java-1.7.0-openjdk-arm-fixes.patch |   22 -----
 java-1.7.0-openjdk.spec            |   59 ++++----------
 rhino-icedtea-2.1.1.patch          |  157 ------------------------------------
 sources                            |    3 +-
 5 files changed, 17 insertions(+), 225 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 782cd98..b69b151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /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 277c658..1c153f2 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,7 +1,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 aarch64			aarch64 arm64 armv8
@@ -139,7 +139,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.11%{?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
@@ -197,12 +197,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
@@ -234,9 +228,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
@@ -258,13 +249,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
@@ -445,24 +429,12 @@ Please note, the java-atk-wrapper is still in beta, and also OpenJDK itself is s
 Although working pretty fine, there are known issues with accessibility on, so do not rather install this package unless you really need.
 
 %prep
-
-%ifarch %{arm}
-%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
 cp %{SOURCE2} .
 
 # OpenJDK patches
 
-# Rhino patch -- one default version (100) and one specific to 2.1.1 (400)
-%ifarch %{arm}
-%patch400
-%else
 %patch100
-%endif
 
 # pulseaudio support
 %if %{with_pulseaudio}
@@ -522,11 +494,6 @@ tar xzf %{SOURCE7}
 %patch102
 %endif
 
-# Arm fixes
-%ifarch %{arm}
-%patch103
-%endif
-
 # Disable system LCMS2
 %patch500
 
@@ -621,11 +588,7 @@ make \
   ANT="/usr/bin/ant" \
   DISTRO_NAME="Fedora" \
   DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
-%ifarch %{arm}
-  JDK_UPDATE_VERSION="03" \
-%else
   JDK_UPDATE_VERSION=`printf "%02d" %{buildver}` \
-%endif
   MILESTONE="fcs" \
   HOTSPOT_BUILD_JOBS="$NUM_PROC" \
   STATIC_CXX="false" \
@@ -972,6 +935,7 @@ exit 0
   alternatives --remove java %{jrebindir}/java
   alternatives --remove jre_%{origin} %{_jvmdir}/%{jredir}
   alternatives --remove jre_%{javaver} %{_jvmdir}/%{jredir}
+  alternatives --remove jre_%{javaver}_%{origin} %{_jvmdir}/%{jrelnk}
 
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
@@ -1137,7 +1101,7 @@ for X in %{origin} %{javaver} ; do
   fi
 done
 
-update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdklnk} %{priority} \
+update-alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir} %{priority} \
 --slave %{_jvmjardir}/java-%{javaver}-%{origin}       java_sdk_%{javaver}_%{origin}_exports      %{_jvmjardir}/%{sdkdir}
 
 
@@ -1147,6 +1111,7 @@ exit 0
   alternatives --remove javac %{sdkbindir}/javac
   alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdkdir}
   alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdkdir}
+  alternatives --remove java_sdk_%{javaver}_%{origin} %{_jvmdir}/%{sdkdir}
 
 exit 0
 
@@ -1256,9 +1221,7 @@ exit 0
 %{_mandir}/man1/javah-%{uniquesuffix}.1*
 %{_mandir}/man1/javap-%{uniquesuffix}.1*
 %{_mandir}/man1/jconsole-%{uniquesuffix}.1*
-%ifnarch %{arm} # Only in u4+
 %{_mandir}/man1/jcmd-%{uniquesuffix}.1*
-%endif
 %{_mandir}/man1/jdb-%{uniquesuffix}.1*
 %{_mandir}/man1/jhat-%{uniquesuffix}.1*
 %{_mandir}/man1/jinfo-%{uniquesuffix}.1*
@@ -1301,12 +1264,20 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Thu Jul 25 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.11.0.f20
+- 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/
+- added removal of new jre-1.7.0-openjdk and java-1.7.0-openjdk alternatives
+- removed patch 400, rhino for 2.1 and other 2.1 conditional stuff
+- removed patch 103 arm-fixes.patch
+
 * Wed Jul 24 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.3.10.11.f20
 - added support for aarch64
  - aarch64 variable to be used in conditions where necessary
  - patch404  aarch64.patch (author: msalter) to add aarch64 support to makefiles
  (needs more tweeking!)
-- added new alternatives jre-1.7.0-openjd and java-1.7.0-openjdk to keep
+- added new alternatives jre-1.7.0-openjdk and java-1.7.0-openjdk to keep
  backward comaptibility after uniquesuffix and add/remove alternatives approach
 - removed arm_arches variable in favour of standart arm one
 
diff --git a/sources b/sources
index bc2ceb4..80a0626 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,4 @@ ea344cc5b53b73f375558ba41760ff64  class-rewriter.tar.gz
 200676ae97998b6f5bc18ff77e35d222  desktop-files.tar.gz
 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