From 11a4bde0373dca704266988403f45aca2567ad92 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jan 07 2015 04:48:45 +0000
Subject: Update to version 18


---

diff --git a/.gitignore b/.gitignore
index 76c7eb1..71527eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-guava-r05.tar.bz2
+/guava-r05.tar.bz2
 /guava-r09.tar.bz2
 /guava-11.0.2.tar.xz
 /guava-15.0.tar.xz
 /guava-17.0.tar.xz
+/v18.0.tar.xz
diff --git a/guava-java8.patch b/guava-java8.patch
index 9af882f..45fbaa5 100644
--- a/guava-java8.patch
+++ b/guava-java8.patch
@@ -17,10 +17,10 @@ index 0f05f78..d5bd950 100644
  import java.io.Serializable;
 +import java.lang.annotation.Annotation;
 +import java.lang.reflect.AnnotatedType;
+ import java.lang.reflect.AnnotatedElement;
  import java.lang.reflect.Array;
  import java.lang.reflect.GenericArrayType;
- import java.lang.reflect.GenericDeclaration;
-@@ -368,6 +370,22 @@ final class Types {
+@@ -371,6 +373,22 @@ final class Types {
          return false;
        }
      }
@@ -43,6 +43,3 @@ index 0f05f78..d5bd950 100644
    }
  
    static final class WildcardTypeImpl implements WildcardType, Serializable {
--- 
-1.9.3
-
diff --git a/guava.spec b/guava.spec
index 2c92b79..ab1f443 100644
--- a/guava.spec
+++ b/guava.spec
@@ -1,12 +1,11 @@
 Name:          guava
-Version:       17.0
-Release:       2%{?dist}
+Version:       18.0
+Release:       1%{?dist}
 Summary:       Google Core Libraries for Java
-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-%{version}/ v%{version}) | xz >guava-%{version}.tar.xz
-Source0:       %{name}-%{version}.tar.xz
+License:       ASL 2.0
+URL:           https://code.google.com/p/guava-libraries
+
+Source0:       https://github.com/google/guava/archive/v%{version}.tar.gz
 Patch0:        %{name}-java8.patch
 
 BuildRequires: java-devel >= 0:1.7.0
@@ -18,6 +17,9 @@ BuildRequires: apache-ivy
 
 BuildArch:     noarch
 
+# Use the same directory of the main package for subpackage licence and docs
+%global _docdir_fmt %{name}
+
 %description
 Guava is a suite of core and expanded libraries that include
 utility classes, Google’s collections, io classes, and much
@@ -33,7 +35,7 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
 find . -name '*.jar' -delete
 
@@ -56,12 +58,17 @@ find . -name '*.jar' -delete
 %mvn_install
 
 %files -f .mfiles
-%doc AUTHORS CONTRIBUTORS COPYING README*
+%doc AUTHORS CONTRIBUTORS README*
+%license COPYING
 
 %files javadoc -f .mfiles-javadoc
-%doc COPYING
+%license COPYING
 
 %changelog
+* Wed Jan  7 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 18.0-1
+- Update to v. 18 (#1175401)
+- Use %license
+
 * Wed Oct  8 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 17.0-2
 - Add alias for com.google.guava:guava-jdk5
 
diff --git a/sources b/sources
index 532e8f9..1c4d28b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-edaaa1a1f4a86d3cba41d15f69ced345  guava-17.0.tar.xz
+ca638e9f4bd4abb20222169e2f63e4cc  v18.0.tar.gz