[java-1.8.0-openjdk/f20: 2/2] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/java-1.8.0-openjdk into f20

[jiri vanek]

commit 005fe8966e89db6672982f4d0ae10fdb256078e4
Merge: 2764250 2e7dce2
Author: Jiri Vanek <jvanek at redhat.com>
Date:   Fri Oct 24 13:55:14 2014 +0200

    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/java-1.8.0-openjdk into f20
    
    Conflicts:
    	java-1.8.0-openjdk.spec

 java-1.8.0-openjdk.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc java-1.8.0-openjdk.spec
index 9eb29ad,f1f5397..b135c8a
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@@ -429,7 -429,9 +429,10 @@@ sh %{SOURCE12
  %patch3
  %patch4
  %patch5
+ %patch6
+ %patch7
+ %patch11
 +%patch12
  
  %patch99
  
@@@ -1130,11 -1129,9 +1133,14 @@@ exit 
  %{_jvmdir}/%{jredir}/lib/accessibility.properties
  
  %changelog
 +* Fri Oct 24 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.25-1.b18
 +- added patch12,removeSunEcProvider-RH1154143
 +- Add check for src.zip completeness. See RH1130490 (by sgehwolf at redhat.com)
 +- Resolves: rhbz#1125260
 +
+ * Mon Oct 20 2014 Omair Majid <omajid at redhat.com> - 1:1.8.0.25-1.b18
+ - Apply patches accidentally left out
+ 
  * Wed Oct 15 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.25-0.b18
  - updated to security u25
  - partial sync with f21