[icedtea-web/f17: 3/3] Merge branch 'f16' into f17

[Deepak Bhole]

commit 8bf698f4c3f3f55823dbca357e036c90d553f371
Merge: 030afdc d8ca178
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Tue Jul 31 14:45:26 2012 -0400

    Merge branch 'f16' into f17
    
    Updated to 1.2.1
    Resolves: RH840592/CVE-2012-3422
    Resolves: RH841345/CVE-2012-3423

 .gitignore       |    1 +
 icedtea-web.spec |    9 +++++++--
 sources          |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index fbfbfd7,4cc3be5..074dd82
--- a/.gitignore
+++ b/.gitignore
@@@ -3,5 -3,7 +3,6 @@@
  /icedtea-web-1.0.4.tar.gz
  /icedtea-web-1.1.1.tar.gz
  /icedtea-web-1.1.2.tar.gz
 -/icedtea-web-1.1.3.tar.gz
  /icedtea-web-1.1.4.tar.gz
  /icedtea-web-1.2.tar.gz
+ /icedtea-web-1.2.1.tar.gz
diff --cc icedtea-web.spec
index dca9565,bcbdc2f..6b5ec92
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@@ -168,16 -167,13 +168,21 @@@ exit 
  %doc COPYING
  
  %changelog
+ * Tue Jul 31 2012 Deepak Bhole <dbhole at redhat.com> 1.2.1-1
+ - Updated to 1.2.1
+ - Resolves: RH840592/CVE-2012-3422
+ - Resolves: RH841345/CVE-2012-3423
+ 
 -* Tue Apr 17 2012 Deepak Bhole <dbhole at redhat.com> 1.2-2
 +* Thu May 03 2012 Deepak Bhole <dbhole at redhat.com> 1.2-4
 +- Resolves rhbz#814585
 +- Fixed java-plugin provides and added one for javaws
 +
 +* Tue Apr 17 2012 Deepak Bhole <dbhole at redhat.com> 1.2-3
  - Updated summary
 +- Fixed virtual provide
 +
 +* Tue Mar 13 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.2-2
 +- Enable building on ARM platforms
  
  * Mon Mar 05 2012 Deepak Bhole <dbhole at redhat.com> 1.2-1
  - Updated to 1.2