[guava] Update to upstream version 13.0

[Mikolaj Izdebski]

commit 24db2d70ebb6294336575e8239020af1e1a2f619
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Aug 7 19:09:13 2012 +0200

    Update to upstream version 13.0
    
    - Remove RPM bug workaround
    - Convert patches to pom macros

 guava-11.0.2-remove-animal-sniffer.patch |   20 ----------------
 guava-pom.patch                          |   26 ---------------------
 guava.spec                               |   37 +++++++++--------------------
 sources                                  |    2 +-
 4 files changed, 13 insertions(+), 72 deletions(-)
---
diff --git a/guava.spec b/guava.spec
index 9346158..b3f1e93 100644
--- a/guava.spec
+++ b/guava.spec
@@ -1,15 +1,14 @@
 Name:          guava
-Version:       11.0.2
-Release:       2%{?dist}
+Version:       13.0
+Release:       1%{?dist}
 Summary:       Google Core Libraries for Java
 
 Group:         Development/Libraries
 License:       ASL 2.0 
 URL:           http://code.google.com/p/guava-libraries
 # git clone https://code.google.com/p/guava-libraries/
-# cd guava-libraries && git archive --format=tar --prefix=guava-11.0.2/ v11.0.2 | xz > guava-11.0.2.tar.xz
+# (cd ./guava-libraries && git archive --format=tar --prefix=guava-%{version}/ v%{version}) | xz >guava-%{version}.tar.xz
 Source0:       %{name}-%{version}.tar.xz
-Patch0:        guava-11.0.2-remove-animal-sniffer.patch
 
 BuildRequires: java-devel >= 0:1.7.0
 BuildRequires: jpackage-utils
@@ -18,17 +17,12 @@ BuildRequires: sonatype-oss-parent
 BuildRequires: maven
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-dependency-plugin
-BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-provider-junit4
-#BuildRequires: animal-sniffer
-#BuildRequires: mojo-signatures
 
 BuildRequires: jsr-305 >= 0-0.6.20090319svn
 BuildRequires: ant-nodeps
-BuildRequires: jdiff
 
 Requires:      jsr-305
 
@@ -56,14 +50,10 @@ API documentation for %{name}.
 %setup -q -n %{name}-%{version}
 find . -name '*.jar' -delete
 
-# guava/lib/jdiff.jar
-ln -sf $(build-classpath jdiff) guava/lib/jdiff.jar
-
-%patch0 -p0
-
-sed -i "s|<module>guava-gwt</module>|<!--module>guava-gwt</module-->|" pom.xml
-sed -i "s|<module>guava-testlib</module>|<!--module>guava-testlib</module-->|" pom.xml
-sed -i "s|<module>guava-tests</module>|<!--module>guava-tests</module-->|" pom.xml
+%pom_disable_module guava-gwt
+%pom_disable_module guava-testlib
+%pom_disable_module guava-tests
+%pom_remove_plugin :animal-sniffer-maven-plugin guava
 
 %build
 
@@ -74,7 +64,6 @@ mvn-rpmbuild install javadoc:aggregate
 # jars
 mkdir -p %{buildroot}%{_javadir}
 install -pm 644 %{name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -pm 644 %{name}-bootstrap/target/%{name}-bootstrap-%{version}.jar %{buildroot}%{_javadir}/guava-bootstrap.jar
 
 # poms
 mkdir -p %{buildroot}%{_mavenpomdir}
@@ -82,18 +71,11 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
 %add_maven_depmap JPP-%{name}-parent.pom
 install -pm 644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "com.google.collections:google-collections"
-install -pm 644 %{name}-bootstrap/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-bootstrap.pom
-%add_maven_depmap JPP-%{name}-bootstrap.pom %{name}-bootstrap.jar
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
-%pre javadoc
-# workaround for rpm bug 646523 (can be removed in F-18)
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
 %files
 %doc AUTHORS CONTRIBUTORS COPYING README*
 %{_javadir}/%{name}*.jar
@@ -105,6 +87,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc COPYING
 
 %changelog
+* Tue Aug  7 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 13.0-1
+- Update to upstream version 13.0
+- Remove RPM bug workaround
+- Convert patches to pom macros
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 7366054..769a38f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e4794f4736c11e7ce46b7e37b829cc7  guava-11.0.2.tar.xz
+c25b920515617588c36506c7ca4dc9e2  guava-13.0.tar.xz