[java-1.7.0-openjdk: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/java-1.7.0-openjdk

[jiri vanek]

commit f659595d882192d2a186e2e5a669cc5c6f7f2536
Merge: b23d3f5 b4ca7f6
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Fri Mar 29 14:04:26 2013 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/java-1.7.0-openjdk
    
    Conflicts:
    	java-1.7.0-openjdk.spec

 java-1.7.0-openjdk.spec |   40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 deletions(-)
---
diff --cc java-1.7.0-openjdk.spec
index 37c11b0,b34d705..5c4b6fa
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@@ -149,7 -149,7 +149,7 @@@
  
  Name:    java-%{javaver}-%{origin}
  Version: %{javaver}.%{buildver}
- Release: %{icedtea_version}.2%{?dist}
 -Release: %{icedtea_version}.3%{?dist}
++Release: %{icedtea_version}.4%{?dist}
  # 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
@@@ -1424,9 -1434,17 +1434,20 @@@ exit 
  %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
  
  %changelog
- * Fri Mar 29 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.8.1.fc20
++* Fri Mar 29 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.8.4.fc20
 +- Updated to java-access-bridge-1.26.2.tar.bz2
 +
+ * Tue Mar 26 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.8.3.fc20
+ - added manual deletion of classes.jsa
+ - ghost classes.jsa restricted to jitarches and to full path
+ - zlib in BuildReq restricted for  1.2.3-7 or higher
+  - see https://bugzilla.redhat.com/show_bug.cgi?id=904231
+ 
+ * Tue Mar 26 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.8.2.fc20
+ - Removed a -icedtea tag from the version
+   - package have less and less connections to icedtea7
+ - Added link to nss as noreplace bug to previous changelog item
+ 
  * Mon Mar 25 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.8.1.fc20
  - Bumped release
  - Added and applied patch500 java-1.7.0-openjdk-fixZeroAllocFailure.patch