[icedtea-web/f16] - Updated to 1.1.2 - Removed all patches (now upstream) - Resolves: rhbz# 734890

Deepak Bhole dbhole at fedoraproject.org
Thu Sep 1 18:12:51 UTC 2011


commit 965e7648cba8d731a8adcd363aaf9d16d9933914
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Thu Sep 1 14:11:38 2011 -0400

    - Updated to 1.1.2
    - Removed all patches (now upstream)
    - Resolves: rhbz# 734890

 icedtea-web-1.1.1-JRE-install.patch |  118 -----------------------------------
 icedtea-web-1.1.1-PR768.patch       |   12 ----
 icedtea-web-1.1.1-PR769.patch       |   21 ------
 icedtea-web.spec                    |   24 +++-----
 4 files changed, 8 insertions(+), 167 deletions(-)
---
diff --git a/icedtea-web.spec b/icedtea-web.spec
index 32cb324..7e59a71 100644
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@ -40,8 +40,8 @@
 %define binsuffix      .itweb
 
 Name:		icedtea-web
-Version:	1.1.1
-Release:	4%{?dist}
+Version:	1.1.2
+Release:	1%{?dist}
 Summary:	Additional Java components for OpenJDK
 
 Group:      Applications/Internet
@@ -49,16 +49,6 @@ License:    LGPLv2+ and GPLv2 with exceptions
 URL:        http://icedtea.classpath.org/wiki/IcedTea-Web
 Source0:    http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz
 
-# Fix PR768: Signed applets/Web  start apps don't work with OpenJDK7 and up
-Patch0:     icedtea-web-1.1.1-PR768.patch
-
-# Fix PR769: IcedTea-Web plugin does not work with some ssl sites with OpenJDK7
-Patch1:     icedtea-web-1.1.1-PR769.patch
-
-# Allow icedtea-web to work with JRE only
-# http://icedtea.classpath.org/hg/release/icedtea-web-1.1/raw-rev/25dc7d8cb757
-Patch2:     %{name}-%{version}-JRE-install.patch
-
 BuildRequires:  java-%{javaver}-openjdk-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gecko-devel
@@ -104,9 +94,6 @@ This package contains Javadocs for the IcedTea-Web project.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 autoconf
@@ -140,7 +127,7 @@ desktop-file-install --vendor ''\
 if [ $1 -gt 1 ]
 then
 alternatives --remove %{javaplugin} \
-  %{jre6dir}/lib/%{archinstall}/IcedTeaPlugin.so 2>/dev/null  	
+  %{jre6dir}/lib/%{archinstall}/IcedTeaPlugin.so 2>/dev/null || :	
 fi
 
 %posttrans
@@ -180,6 +167,11 @@ exit 0
 %doc COPYING
 
 %changelog
+* Thu Sep 01 2011 Deepak Bhole <dbhole at redhat.com> 1.1.2-1
+- Updated to 1.1.2
+- Removed all patches (now upstream)
+- Resolves: rhbz# 734890
+
 * Fri Aug 26 2011 Deepak Bhole <dbhole at redhat.com> 1.1.1-4
 - Build against java 1.6.0
 


More information about the scm-commits mailing list