java-1.7.0-openjdk: update to icedtea 2.3.8

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7544 ec354946-7b23-47d6-9f5a-488ba84defc7

j/java-1.7.0-openjdk/java-1.7.0-openjdk-vl.spec

@@ -6,10 +6,7 @@
 # If debug is 1, OpenJDK is built with all debug info present.
 %global debug 0
 
-# If runtests is 0 test suites will not be run.
-%global runtests 0
-
-%global icedtea_version 2.2.1
+%global icedtea_version 2.3.8
 %global hg_tag icedtea-{icedtea_version}
 
 %global accessmajorver 1.23
@@ -17,7 +14,6 @@
 %global accessver %{accessmajorver}.%{accessminorver}
 %global accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
-%global mauvedate 2008-10-22
 
 %global multilib_arches ppc64 sparc64 x86_64
 
@@ -110,9 +106,9 @@
 
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
-%global buildver        5
-# Keep priority on 5digits in case buildver>9
-%global priority        1700%{buildver}
+%global buildver        9
+# Keep priority on 6digits in case buildver>9
+%global priority        17000%{buildver}
 %global javaver         1.7.0
 
 # Standard JPackage directories and symbolic links.
@@ -164,7 +160,7 @@ URL:      http://openjdk.java.net/
 #head
 #REPO=http://icedtea.classpath.org/hg/icedtea7-forest
 #current release
-#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2
+#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3
 # hg clone $REPO/ openjdk -r %{hg_tag}
 # hg clone $REPO/corba/ openjdk/corba -r %{hg_tag}
 # hg clone $REPO/hotspot/ openjdk/hotspot -r %{hg_tag}
@@ -183,46 +179,41 @@ Source1:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2
 # README file
 Source2:  README.src
 
-# Mauve test suite
-# FIXME: Is this applicable for 7?
-Source3:  mauve-%{mauvedate}.tar.gz
-Source4:  mauve_tests
-
 # javac wrapper (used during bootstrap to strip what ecj doesn't support)
-Source5: javac-wrapper
+Source3: javac-wrapper
 
 # Auto-generated files (used only in bootstrap)
 # To reproduce: 
 # build OpenJDK7 tarball above with any JDK
 # mv generated.build generated
 # tar czf generated-files.tar.gz generated
-Source6: generated-files.tar.gz
+Source4: generated-files.tar.gz
 
 # Class rewrite to rewrite rhino hierarchy
-Source7: class-rewriter.tar.gz
+Source5: class-rewriter.tar.gz
 
 # Systemtap tapsets. Zipped up to keep it small.
-Source8: systemtap-tapset.tar.gz
+Source6: systemtap-tapset.tar.gz
 
 # .desktop files. Zipped up to keep it small.
-Source9: desktop-files.tar.gz
+Source7: desktop-files.tar.gz
 
 # nss configuration file
-Source10: nss.cfg
+Source8: nss.cfg
 
 # FIXME: Taken from IcedTea snapshot 877ad5f00f69, but needs to be moved out
 # hg clone -r 877ad5f00f69 http://icedtea.classpath.org/hg/icedtea7
-Source11: pulseaudio.tar.gz
+Source9: pulseaudio.tar.gz
 
 # Removed libraries that we link instead
-Source12: remove-intree-libraries.sh
+Source10: remove-intree-libraries.sh
 
 # For primary arches, build latest and for secondary, use hs22
 # base (icedtea-2.2.1 tag)
 
 # http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
-# hg tag: icedtea-2.1.1
-Source100:  openjdk-icedtea-2.1.1.tar.gz
+# hg tag: icedtea-2.1.6
+Source100:  openjdk-icedtea-2.1.6.tar.gz
 
 # RPM/distribution specific patches
 
@@ -262,6 +253,8 @@ Patch103: %{name}-arm-fixes.patch
 Patch104: %{name}-ppc-zero-jdk.patch
 Patch105: %{name}-ppc-zero-hotspot.patch
 
+Patch106: %{name}-freetype-check-fix.patch
+
 #
 # Bootstrap patches (code with this is never shipped)
 #
@@ -424,13 +417,7 @@ BuildRequires: java-1.5.0-gcj-devel
 %else
 BuildRequires: java-devel >= 1.6.0
 %endif
-# Mauve build requirements.
-BuildRequires: xorg-x11-server-Xvfb
-BuildRequires: xorg-x11-fonts-Type1
-BuildRequires: xorg-x11-fonts-misc
-BuildRequires: freetype2-devel >= 2.3.0
 BuildRequires: fontconfig
-BuildRequires: ecj
 # Java Access Bridge for GNOME build requirements.
 BuildRequires: at-spi-devel
 BuildRequires: gawk
@@ -577,10 +564,8 @@ The OpenJDK API documentation.
 %endif
 
 %setup -q -c -n %{name} -T -a %{source_num}
-%setup -q -n %{name} -T -D -a 3
 %setup -q -n %{name} -T -D -a 1
 cp %{SOURCE2} .
-cp %{SOURCE4} .
 
 # OpenJDK patches
 
@@ -602,21 +587,21 @@ cp %{SOURCE4} .
 %endif
 
 # Remove libraries that are linked
-sh %{SOURCE12}
+sh %{SOURCE10}
 
 # Copy jaxp, jaf and jaxws drops
 mkdir drops/
 
 # Extract the generated files
-tar xzf %{SOURCE6}
+tar xzf %{SOURCE4}
 
 # Extract the rewriter (to rewrite rhino classes)
-tar xzf %{SOURCE7}
+tar xzf %{SOURCE5}
 
 # Extract systemtap tapsets
 %if %{with_systemtap}
 
-tar xzf %{SOURCE8}
+tar xzf %{SOURCE6}
 
 for file in tapset/*.in; do
 
@@ -632,11 +617,11 @@ done
 
 # Pulseaudio
 %if %{with_pulseaudio}
-tar xzf %{SOURCE11}
+tar xzf %{SOURCE9}
 %endif
 
 # Extract desktop files
-tar xzf %{SOURCE9}
+tar xzf %{SOURCE7}
 
 # If bootstrapping, apply additional patches
 %if %{gcjbootstrap}
@@ -716,6 +701,8 @@ patch -l -p0 < %{PATCH102}
 patch -l -p0 < %{PATCH103}
 %endif
 
+patch -l -p0 < %{PATCH106}
+
 %ifarch ppc ppc64
 # PPC fixes
 patch -l -p0 < %{PATCH104}
@@ -765,8 +752,8 @@ mkdir -p bootstrap/boot
 cp -aL %{_jvmdir}/java-gcj/* bootstrap/boot/ || : # broken symlinks can be non-fatal but may cause this to fail
 
 # Replace javac with a wrapper that does some magic
-cp -af %{SOURCE5} bootstrap/boot/bin/javac
-chmod u+x bootstrap/boot/bin/javac # SOURCE5 may not be +x
+cp -af %{SOURCE3} bootstrap/boot/bin/javac
+chmod u+x bootstrap/boot/bin/javac # SOURCE3 may not be +x
 sed -i -e s:@RT_JAR@:$PWD/bootstrap/boot/jre/lib/rt.jar:g bootstrap/boot/bin/javac
 
 # Link the native2ascii binary
@@ -870,8 +857,8 @@ umask $oldumask
 
 make \
   ANT="/usr/bin/ant" \
-  DISTRO_NAME="Fedora" \
-  DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
+  DISTRO_NAME="Vine Linux" \
+  DISTRO_PACKAGE_VERSION="vine-%{release}-%{_arch}" \
 %ifarch %{jit_arches}
   JDK_UPDATE_VERSION=`printf "%02d" %{buildver}` \
 %else
@@ -886,6 +873,7 @@ make \
   FT2_LIBS="-lfreetype " \
   DEBUG_CLASSFILES="true" \
   DEBUG_BINARIES="true" \
+  STRIP_POLICY="no_strip" \
   ALT_STRIP_POLICY="no_strip" \
 %ifnarch %{jit_arches}
   LIBFFI_CFLAGS="`pkg-config --cflags libffi` " \
@@ -903,6 +891,10 @@ make \
 
 popd >& /dev/null
 
+%ifarch %{jit_arches}
+chmod 644 $(pwd)/%{buildoutputdir}/j2sdk-image/lib/sa-jdi.jar
+%endif
+
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
 
 # Build pulseaudio and install it to JDK build location
@@ -931,43 +923,16 @@ popd
 # Copy tz.properties
 echo "sun.zoneinfo.dir=/usr/share/javazi" >> $JAVA_HOME/jre/lib/tz.properties
 
-%if %{runtests}
-# Run jtreg test suite.
-{
-  echo ====================JTREG TESTING========================
-  export DISPLAY=:20
-  Xvfb :20 -screen 0 1x1x24 -ac&
-  echo $! > Xvfb.pid
-  make jtregcheck -k
-  kill -9 `cat Xvfb.pid`
-  unset DISPLAY
-  rm -f Xvfb.pid
-  echo ====================JTREG TESTING END====================
-} || :
-
-# Run Mauve test suite.
-{
-  pushd mauve-%{mauvedate}
-    ./configure
-    make
-    echo ====================MAUVE TESTING========================
-    export DISPLAY=:20
-    Xvfb :20 -screen 0 1x1x24 -ac&
-    echo $! > Xvfb.pid
-    $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java \
-      -file %{SOURCE4} -timeout 30000 2>&1 | tee mauve_output
-    kill -9 `cat Xvfb.pid`
-    unset DISPLAY
-    rm -f Xvfb.pid
-    echo ====================MAUVE TESTING END====================
-  popd
-} || :
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 STRIP_KEEP_SYMTAB=libjvm*
 
+# Install symlink to default soundfont
+install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/audio
+pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/audio
+ln -s %{_datadir}/soundfonts/default.sf2
+popd
+
 pushd %{buildoutputdir}/j2sdk-image
 
   # Install main files.
@@ -1057,7 +1022,7 @@ popd
 
 
 # Install nss.cfg
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/
 
 
 # Install Javadoc documentation.
@@ -1195,11 +1160,13 @@ alternatives \
   --slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \
   --slave %{_bindir}/apt apt %{sdkbindir}/apt \
   --slave %{_bindir}/extcheck extcheck %{sdkbindir}/extcheck \
+  --slave %{_bindir}/idlj idlj %{sdkbindir}/idlj \
   --slave %{_bindir}/jar jar %{sdkbindir}/jar \
   --slave %{_bindir}/jarsigner jarsigner %{sdkbindir}/jarsigner \
   --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \
   --slave %{_bindir}/javah javah %{sdkbindir}/javah \
   --slave %{_bindir}/javap javap %{sdkbindir}/javap \
+  --slave %{_bindir}/jcmd jcmd %{sdkbindir}/jcmd \
   --slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \
   --slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \
   --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \
@@ -1342,6 +1309,8 @@ exit 0
 %{_mandir}/man1/tnameserv-%{name}.1*
 %{_mandir}/man1/unpack200-%{name}.1*
 %{_jvmdir}/%{jredir}/lib/security/nss.cfg
+%{_jvmdir}/%{jredir}/lib/audio/
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -1408,12 +1377,6 @@ exit 0
 %defattr(-,root,root,-)
 %doc README.src
 %{_jvmdir}/%{sdkdir}/src.zip
-%if %{runtests}
-# FIXME: put these in a separate testresults subpackage.
-%doc mauve_tests
-%doc mauve-%{mauvedate}/mauve_output
-%doc test/jtreg-summary.log
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -1421,6 +1384,9 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Tue Mar 12 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.0.9-2.3.8.1
+- update to icedtea7 2.3.8
+
 * Sun Jul 22 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.0.5-2.2.1.1
 - initial build for Vine Linux