From 1db308940e6b52e30e1b00e78829e2130aaaabd0 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Jul 30 2015 06:52:45 +0000
Subject: Update to upstream 3.1.1 release.


---

diff --git a/docker-client-1.19-api.patch b/docker-client-1.19-api.patch
deleted file mode 100644
index 4e3af3c..0000000
--- a/docker-client-1.19-api.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 73f4e7c09ed92b7b28e688376408745b46fadb2b Mon Sep 17 00:00:00 2001
-From: Roland Grunberg <rgrunber@redhat.com>
-Date: Fri, 10 Jul 2015 13:07:11 -0400
-Subject: [PATCH] Support Remote API v1.19.
-
-- Debug field in Info changed from an integer back to a boolean.
----
- src/main/java/com/spotify/docker/client/messages/Info.java | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git src/main/java/com/spotify/docker/client/messages/Info.java src/main/java/com/spotify/docker/client/messages/Info.java
-index f71b72c..b39afcd 100644
---- src/main/java/com/spotify/docker/client/messages/Info.java
-+++ src/main/java/com/spotify/docker/client/messages/Info.java
-@@ -17,8 +17,6 @@
- 
- package com.spotify.docker.client.messages;
- 
--import com.google.common.base.Joiner;
--
- import com.fasterxml.jackson.annotation.JsonProperty;
- 
- import java.util.List;
-@@ -36,7 +34,7 @@ public class Info {
-   @JsonProperty("Name") private String name;
-   @JsonProperty("ID") private String id;
-   @JsonProperty("OperatingSystem") private String operatingSystem;
--  @JsonProperty("Debug") private int debug;
-+  @JsonProperty("Debug") private Boolean debug;
-   @JsonProperty("NFd") private int fileDescriptors;
-   @JsonProperty("NGoroutines") private int goroutines;
-   @JsonProperty("NEventsListener") private int eventsListener;
-@@ -94,7 +92,7 @@ public class Info {
-   }
- 
-   public boolean debug() {
--    return debug != 0;
-+    return debug;
-   }
- 
-   public int fileDescriptors() {
-@@ -208,7 +206,7 @@ public class Info {
-     result = 31 * result + (name != null ? name.hashCode() : 0);
-     result = 31 * result + (executionDriver != null ? executionDriver.hashCode() : 0);
-     result = 31 * result + (kernelVersion != null ? kernelVersion.hashCode() : 0);
--    result = 31 * result + debug;
-+    result = 31 * result + (debug != null ? debug.hashCode() : 0);
-     result = 31 * result + fileDescriptors;
-     result = 31 * result + goroutines;
-     result = 31 * result + eventsListener;
-@@ -224,7 +222,7 @@ public class Info {
-   public String toString() {
-     return String.format("Info{ containers = %d, images = %d, storageDriver = %s, "
-                          + "driverStatus = %s, cpus = %d, memTotal = %d, name = %s, "
--                         + "executionDriver = %s, kernelVersion = %s, debug = %d, "
-+                         + "executionDriver = %s, kernelVersion = %s, debug = %b, "
-                          + "fileDescriptors = %d, goroutines = %d, eventsListener = %d, "
-                          + "initPath = %s, initSha1 = %s, indexServerAddress = %s, "
-                          + "memoryLimit = %b, swapLimit = %b",
--- 
-2.1.0
-
diff --git a/docker-client.spec b/docker-client.spec
index b73ddc9..abea76a 100644
--- a/docker-client.spec
+++ b/docker-client.spec
@@ -2,17 +2,15 @@
 %{!?scl:%global pkg_name %{name}}
 
 Name:           %{?scl_prefix}docker-client
-Version:        3.0.0
-Release:        2%{?dist}
+Version:        3.1.1
+Release:        1%{?dist}
 Summary:        Docker Client
 
 License:        ASL 2.0
 URL:            https://github.com/spotify/docker-client
-Source0:        https://github.com/spotify/docker-client/archive/v3.0.0.tar.gz
+Source0:        https://github.com/spotify/docker-client/archive/v%{version}.tar.gz
 
 Patch0:         add-manifest.patch
-# https://github.com/spotify/docker-client/pull/209
-Patch1:         %{pkg_name}-1.19-api.patch
 # Apache httpcomponents-core >= 4.4 calls setSoLinger
 Patch2:         %{pkg_name}-so-linger.patch
 
@@ -71,7 +69,6 @@ The Docker Client is a Java API library for accessing a Docker daemon.
 %prep
 %setup -q -n docker-client-%{version}
 %patch0
-%patch1
 %patch2
 %pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
 %pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
@@ -89,6 +86,9 @@ export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/E
 %doc NOTICE README.md
 
 %changelog
+* Thu Jul 30 2015 Alexander Kurtakov <akurtako@redhat.com> 3.1.1-1
+- Update to upstream 3.1.1 release.
+
 * Wed Jul 22 2015 Roland Grunberg <rgrunber@redhat.com> - 3.0.0-2
 - Support the 1.19 Docker Remote API.
 - Support SO_LINGER option needed when httpcomponents-core >= 4.4.
diff --git a/sources b/sources
index ec94595..cf0bfc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c43f5b2a2dcdabdb28766c6bebec9f21  v3.0.0.tar.gz
+9f34d61f1f0e39fb2e25643bd6b3024f  v3.1.1.tar.gz