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

[jiri vanek]

commit d568bcf5072abcad3cc96adfb4d623fcff3d3e0b
Merge: 2ec1bfa a5e4f26
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Tue Jul 22 12:12:01 2014 +0200

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

 java-1.7.0-openjdk.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc java-1.7.0-openjdk.spec
index d94f5d9,48fe7c6..cedbf2f
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@@ -1573,11 -1568,10 +1573,14 @@@ exit 
  %{_jvmdir}/%{jredir}/lib/accessibility.properties
  
  %changelog
+ * Thu Jul 17 2014 Rex Dieter <rdieter at fedoraproject.org> - 1.7.0.65-2.5.1.3
+ - rebuild (for pulseaudio, bug #1117683)
+ 
  * Mon Jul 14 2014 Jiri Vanek  <jvanek at redhat.com> - 1.7.0.65-2.5.1.2
 +- excluded libmawt.so from autorequires/autoprovides
 +- see https://bugzilla.redhat.com/show_bug.cgi?id=1111349
 +
 +* Mon Jul 14 2014 Jiri Vanek  <jvanek at redhat.com> - 1.7.0.65-2.5.1.2
  - added and applied fix for samrtcard io patch405, pr1864_smartcardIO.patch
  
  * Mon Jul 07 2014 Jiri Vanek  <jvanek at redhat.com> - 1.7.0.65-2.5.1.1