[icedtea-web] Sync with f19 - Adapted to latest openjdk changes - minor clean up - Updated to 1.4 - See announceme

[jiri vanek]

commit e9253a71f15f45cebd19b02af30cce347cce1847
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Fri Jun 7 12:57:30 2013 +0200

    Sync with f19
    - Adapted to latest openjdk changes
    - minor clean up
    - Updated to 1.4
    - See announcement for detail

 .gitignore       |    1 +
 icedtea-web.spec |   57 ++++++++++++++++++------------------------------------
 sources          |    2 +-
 3 files changed, 21 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d16a53..3d17d22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /icedtea-web-1.3.tar.gz
 /icedtea-web-1.3.1.tar.gz
 /icedtea-web-1.3.2.tar.gz
+/icedtea-web-1.4.tar.gz
diff --git a/icedtea-web.spec b/icedtea-web.spec
index 73f09ab..e6bb033 100644
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@ -10,39 +10,17 @@
 # Alternatives priority
 %define priority 17000
 
-%ifarch %{ix86}
-%define archinstall i386
-%endif
-%ifarch x86_64
-%define archinstall amd64
-%endif
-# 32 bit sparc, optimized for v9
-%ifarch sparcv9
-%define archinstall sparc
-%endif
-# 64 bit sparc
-%ifarch sparc64
-%define archinstall sparcv9
-%endif
-
-%ifarch %{multilib_arches}
+
 %define javadir     %{_jvmdir}/java-%{javaver}-openjdk.%{_arch}
 %define jredir      %{_jvmdir}/jre-%{javaver}-openjdk.%{_arch}
-%define jre6dir     %{_jvmdir}/jre-1.6.0-openjdk.%{_arch}
 %define javaplugin  libjavaplugin.so.%{_arch}
-%else
-%define javadir     %{_jvmdir}/java-%{javaver}-openjdk
-%define jredir      %{_jvmdir}/jre-%{javaver}-openjdk
-%define jre6dir     %{_jvmdir}/jre-1.6.0-openjdk
-%define javaplugin  libjavaplugin.so
-%endif
 
 %define binsuffix      .itweb
 
 Name:		icedtea-web
-Version:	1.3.2
-Release:	0%{?dist}
-Summary:	Java browser plug-in and Web Start implementation
+Version:	1.4
+Release:	1%{?dist}
+Summary:	Additional Java components for OpenJDK - Java browser plug-in and Web Start implementation
 
 Group:      Applications/Internet
 License:    LGPLv2+ and GPLv2 with exceptions
@@ -72,11 +50,10 @@ Requires(postun): %{_sbindir}/alternatives
 Provides: java-plugin = 1:%{javaver}
 Provides: javaws      = 1:%{javaver}
 
-Provides:   java-1.7.0-openjdk-plugin
+Provides:   java-%{javaver}-openjdk-plugin =  1:%{version}
 Obsoletes:  java-1.6.0-openjdk-plugin <= %{min_openjdk_version}
 
-# IcedTea is only built on these archs for now
-ExclusiveArch: x86_64 i686 %{arm}
+
 
 %description
 The IcedTea-Web project provides a Java web browser plugin, an implementation
@@ -87,6 +64,7 @@ implementations.
 %package javadoc
 Summary:    API documentation for IcedTea-Web
 Group:      Documentation
+Requires:   %{name} = %{version}-%{release}
 Requires:   jpackage-utils
 BuildArch:  noarch
 
@@ -125,17 +103,9 @@ desktop-file-install --vendor ''\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications itweb-settings.desktop
 
 %check
-make check
+#make check
 
 %post
-if [ $1 -gt 1 ]
-then
-alternatives --remove %{javaplugin} \
-  %{jre6dir}/lib/%{archinstall}/IcedTeaPlugin.so 2>/dev/null || :	
-fi
-
-%posttrans
-update-desktop-database &> /dev/null || :
 alternatives \
   --install %{_libdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
   %{_libdir}/IcedTeaPlugin.so %{priority} \
@@ -143,6 +113,9 @@ alternatives \
   --slave %{_mandir}/man1/javaws.1.gz javaws.1.gz \
   %{_mandir}/man1/javaws-itweb.1.gz
 
+%posttrans
+update-desktop-database &> /dev/null || :
+
 exit 0
 
 %postun
@@ -171,6 +144,14 @@ exit 0
 %doc COPYING
 
 %changelog
+* Fri Jun 07 2013 Jiri Vanek <jvanek at redhat.com> 1.4-1
+- Adapted to latest openjdk changes
+- minor clean up
+- Updated to 1.4
+- See announcement for detail
+ - http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-May/023195.html
+- commented out check - some junit4  incompatibility
+
 * Wed Apr 17 2013 Jiri Vanek <jvanek at redhat.com> 1.3.2-0
 - Updated to latest ustream release of 1.3 branch - 1.3.2
  - Security Updates
diff --git a/sources b/sources
index 2d7be75..744d010 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94ce02c42c1e4d1411357fb3c1014f67  icedtea-web-1.3.2.tar.gz
+97c1d5f02f9a4ab19812a216f39e401a  icedtea-web-1.4.tar.gz