From 1c3f85bd760791df373e439bfdbe2449e7ff827f Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@jvanek.redhat>
Date: Aug 30 2012 09:21:30 +0000
Subject: - Sync with rawhide

- Updated to IcedTea-Forest 2.3.1
- Resolves rhbz#RH852051, CVE-2012-4681: Reintroduce PackageAccessible checks
  removed in 6788531.
- Commented out Patch500, java-1.7.0-openjdk-removing_jvisualvm_man.patch as
  as already included in this Iced-Tea.
- Will be nice to verify after next upstream sync if it is still upstreamed
- Add symlink to Fedora's default soundfont rhbz#541466

---

diff --git a/.gitignore b/.gitignore
index 265b5ce..18b439c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /openjdk-icedtea-2.1.tar.gz
 /openjdk-icedtea-2.2.1.tar.gz
 /openjdk-icedtea-2.1.1.tar.gz
+/openjdk-icedtea-2.3.1.tar.gz
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index fcaf1d4..727914c 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -9,7 +9,7 @@
 # If runtests is 0 test suites will not be run.
 %global runtests 0
 
-%global icedtea_version 2.3
+%global icedtea_version 2.3.1
 %global hg_tag icedtea-{icedtea_version}
 
 %global accessmajorver 1.23
@@ -153,7 +153,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}%{?dist}.2
+Release: %{icedtea_version}%{?dist}.1
 # 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
@@ -406,7 +406,7 @@ Patch302: systemtap.patch
 # Rhino support
 Patch400: rhino-icedtea-2.1.1.patch
 
-Patch500: java-1.7.0-openjdk-removing_jvisualvm_man.patch
+#Patch500: java-1.7.0-openjdk-removing_jvisualvm_man.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -693,7 +693,7 @@ cp -a openjdk openjdk-boot
 
 %endif
 
-%patch500
+#%patch500
 
 %build
 # How many cpu's do we have?
@@ -979,6 +979,12 @@ echo "sun.zoneinfo.dir=/usr/share/javazi" >> $JAVA_HOME/jre/lib/tz.properties
 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.
@@ -1353,6 +1359,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,-)
@@ -1432,6 +1440,16 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Thu Aug 30 2012 jiri Vanek <jvanek@redhat.com> - 1.7.0.6-2.3.1.fc17.1
+- Sync with rawhide
+- Updated to IcedTea-Forest 2.3.1
+- Resolves rhbz#RH852051, CVE-2012-4681: Reintroduce PackageAccessible checks 
+  removed in 6788531.
+- Commented out Patch500, java-1.7.0-openjdk-removing_jvisualvm_man.patch as
+  as already included in this Iced-Tea.
+- Will be nice to verify after next upstream sync if it is still upstreamed
+- Add symlink to Fedora's default soundfont rhbz#541466
+
 * Mon Aug 22 2012 Jiri Vanek <jvanek@redhat.com> - 1.7.0.6-2.3.fc17.2
 - ALT_STRIP_POLICY replaced by STRIP_POLICY
 
diff --git a/sources b/sources
index e0755cc..29096c5 100644
--- a/sources
+++ b/sources
@@ -4,7 +4,6 @@ ea344cc5b53b73f375558ba41760ff64  class-rewriter.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
-363f3266940780966014ebc6bb7f1253  openjdk-icedtea-2.3.tar.gz
+414a989568ebcd79e372be361eb541af  openjdk-icedtea-2.3.1.tar.gz
 8eb5ad93dbf2f4fe86e52631969cfb09  systemtap-tapset.tar.gz
-1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
 241579dc0bfb5c148d2f826284817ea9  openjdk-icedtea-2.1.1.tar.gz