[guava: 2/3] Merge branch 'rhbz1109442'

[Mikolaj Izdebski]

commit 4b07e1c1f9258c3458406ee8f39293f56c1639e6
Merge: b973e14 48e8053
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Jun 19 17:15:25 2014 +0200

    Merge branch 'rhbz1109442'
    
    Conflicts:
    	guava.spec

 guava.spec |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --cc guava.spec
index f319652,ef4a5a7..fa2f284
--- a/guava.spec
+++ b/guava.spec
@@@ -42,9 -40,8 +40,10 @@@ find . -name '*.jar' -delet
  %pom_disable_module guava-tests
  %pom_remove_plugin :animal-sniffer-maven-plugin guava
  %pom_remove_plugin :maven-gpg-plugin
+ %pom_remove_dep jdk:srczip guava
  
 +%pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true</_nouses>" guava/pom.xml
 +
  %build
  
  %mvn_file :%{name} %{name}
@@@ -61,9 -58,9 +60,12 @@@
  %doc COPYING
  
  %changelog
 +* Tue Jun 17 2014 Roland Grunberg <rgrunber at redhat.com> - 15.0-4
 +- Do not generate uses directive for exports.
 +
+ * Fri Jun 13 2014 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> 17.0-1
+ - Update to latest upstream version (#1109442).
+ 
  * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15.0-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild