[okhttp] Update to upstream version 2.2.0

Mikolaj Izdebski mizdebsk at fedoraproject.org
Wed Mar 11 14:37:54 UTC 2015


commit 9280898ca0904f681c089f972ee022ee9fc46064
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Mar 11 13:32:45 2015 +0100

    Update to upstream version 2.2.0

 .gitignore  |  1 +
 okhttp.spec | 10 +++++++++-
 sources     |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c6a11af..ba54bca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /okhttp-1.2.1-4eb81fe.tar.gz
 /okhttp-2.0.0.tar.gz
+/okhttp-2.2.0.tar.gz
diff --git a/okhttp.spec b/okhttp.spec
index e6cadf2..1ed3c45 100644
--- a/okhttp.spec
+++ b/okhttp.spec
@@ -1,5 +1,5 @@
 Name:           okhttp
-Version:        2.0.0
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        An HTTP+SPDY client for Java applications
 
@@ -61,6 +61,11 @@ Summary:        OkHttp Sample: Simple Client
 # Plugin prevents build
 %pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
 
+# templating-maven-plugin is not available in Fedora. Filter sources
+# manually before build.
+%pom_remove_plugin :templating-maven-plugin okhttp
+sed 's|\${project.version}|%{version}|' okhttp/src/main/java-templates/com/squareup/okhttp/internal/Version.java >okhttp/src/main/java/com/squareup/okhttp/internal/Version.java
+
 %pom_disable_module mockwebserver
 %pom_disable_module okcurl
 %pom_disable_module benchmarks
@@ -99,6 +104,9 @@ Summary:        OkHttp Sample: Simple Client
 
 
 %changelog
+* Wed Mar 11 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.0-1
+- Update to upstream version 2.2.0
+
 * Thu Sep 25 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.0.0-1
 - Update to upstream version 2.0.0
 
diff --git a/sources b/sources
index af0e768..b6c6f27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b8a6417677340e548fa7c96d4879117  okhttp-2.0.0.tar.gz
+5b8444aa487b6cf936e37c94b489e14c  okhttp-2.2.0.tar.gz


More information about the scm-commits mailing list