[okhttp] Update to upstream version 2.0.0

[Mikolaj Izdebski]

commit 4e858d0212d100ecd1af768f4f880db73b264590
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Sep 25 13:34:52 2014 +0200

    Update to upstream version 2.0.0

 .gitignore  |  1 +
 okhttp.spec | 38 +++++++++++++++++++-------------------
 sources     |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91d68fd..c6a11af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /okhttp-1.2.1-4eb81fe.tar.gz
+/okhttp-2.0.0.tar.gz
diff --git a/okhttp.spec b/okhttp.spec
index ddc2b22..e6cadf2 100644
--- a/okhttp.spec
+++ b/okhttp.spec
@@ -1,20 +1,18 @@
-%global commit 4eb81fee1f807cb97bf8fb39d23652c947561bf2
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name:           okhttp
-Version:        1.2.1
-Release:        3%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        An HTTP+SPDY client for Java applications
 
 License:        ASL 2.0
 URL:            http://square.github.io/%{name}/
-Source0:        https://github.com/square/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0:        https://github.com/square/%{name}/archive/parent-%{version}.tar.gz#/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 
 BuildRequires: maven-local
 BuildRequires: mvn(com.google.code.gson:gson)
+BuildRequires: mvn(com.squareup.okio:okio)
 BuildRequires: mvn(org.apache.maven.plugins:maven-checkstyle-plugin)
-BuildRequires: mvn(org.sonatype.oss:oss-parent)
+BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
 
 %description
 An HTTP+SPDY client for Android and Java applications.
@@ -26,12 +24,6 @@ Summary:        Javadoc for %{name}
 %description javadoc
 API documentation for %{name}.
 
-%package protocols
-Summary:        OkHttp SPDY and HTTP/2.0 internals
-
-%description protocols
-%{summary}.
-
 %package parent
 Summary:        Parent POM for OkHttp
 
@@ -64,27 +56,33 @@ Summary:        OkHttp Sample: Simple Client
 
 
 %prep
-%setup -q -n %{name}-%{commit}
+%setup -q -n %{name}-parent-%{version}
 
 # Plugin prevents build
 %pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
 
 %pom_disable_module mockwebserver
+%pom_disable_module okcurl
+%pom_disable_module benchmarks
+%pom_disable_module static-server samples
+%pom_disable_module crawler samples
+%pom_disable_module okhttp-tests
+%pom_disable_module okhttp-urlconnection
 
-%pom_remove_dep org.mortbay.jetty.npn:npn-boot okhttp
-%pom_remove_dep org.mortbay.jetty.npn:npn-boot okhttp-protocols
+#%pom_remove_dep org.mortbay.jetty.npn:npn-boot okhttp
+#%pom_remove_dep org.mortbay.jetty.npn:npn-boot okhttp-protocols
 
 
 %build
 # We don't have all test deps (e.g. npn-boot)
-%mvn_build -s --skip-tests
+%mvn_build -s --skip-tests -- -P !alpn-when-jdk8
 
 
 %install
 %mvn_install
 
 
-%files protocols -f .mfiles-%{name}-protocols
+%files -f .mfiles-%{name}
 %dir %{_javadir}/%{name}
 %doc LICENSE.txt CHANGELOG.md CONTRIBUTING.md README.md
 
@@ -94,7 +92,6 @@ Summary:        OkHttp Sample: Simple Client
 %files parent -f .mfiles-parent
 %doc LICENSE.txt
 
-%files -f .mfiles-%{name}
 %files apache -f .mfiles-%{name}-apache
 %files samples -f .mfiles-sample-parent
 %files samples-guide -f .mfiles-guide
@@ -102,6 +99,9 @@ Summary:        OkHttp Sample: Simple Client
 
 
 %changelog
+* Thu Sep 25 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.0.0-1
+- Update to upstream version 2.0.0
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 8e0246f..af0e768 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a123734dc53b6f67fd5ed1a4427a9d8  okhttp-1.2.1-4eb81fe.tar.gz
+4b8a6417677340e548fa7c96d4879117  okhttp-2.0.0.tar.gz