From 31ebdc4ded9ecb0bbdb0d42e00abf4ea85d27385 Mon Sep 17 00:00:00 2001
From: Michael Hampton <error@ioerror.us>
Date: Feb 05 2016 00:47:25 +0000
Subject: Update spec and patch for compose 1.6.0


---

diff --git a/docker-compose.spec b/docker-compose.spec
index e020c0d..1b937b8 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -39,6 +39,7 @@ Requires:       python-dockerpty
 Requires:       python-jsonschema
 Requires:       python-enum34
 Requires:       PyYAML
+Requires:       python-cached_property
 
 BuildArch:      noarch
 
diff --git a/remove-requires-upper-bound.patch b/remove-requires-upper-bound.patch
index 57f8683..641bbf5 100644
--- a/remove-requires-upper-bound.patch
+++ b/remove-requires-upper-bound.patch
@@ -1,19 +1,21 @@
-diff -up docker-compose-1.5.2/setup.py.orig docker-compose-1.5.2/setup.py
---- docker-compose-1.5.2/setup.py.orig	2015-12-03 19:36:35.000000000 -0500
-+++ docker-compose-1.5.2/setup.py	2015-12-29 19:57:40.141038849 -0500
-@@ -28,15 +28,15 @@
+diff -up docker-compose-1.6.0/setup.py.orig docker-compose-1.6.0/setup.py
+--- docker-compose-1.6.0/setup.py.orig	2016-02-04 14:41:11.000000000 -0500
++++ docker-compose-1.6.0/setup.py	2016-02-04 19:41:56.363544238 -0500
+@@ -28,16 +28,16 @@
  
  
  install_requires = [
+-    'cached-property >= 1.2.0, < 2',
 -    'docopt >= 0.6.1, < 0.7',
 -    'PyYAML >= 3.10, < 4',
 -    'requests >= 2.6.1, < 2.8',
 -    'texttable >= 0.8.1, < 0.9',
 -    'websocket-client >= 0.32.0, < 1.0',
--    'docker-py >= 1.5.0, < 2',
--    'dockerpty >= 0.3.4, < 0.4',
+-    'docker-py >= 1.7.0, < 2',
+-    'dockerpty >= 0.4.1, < 0.5',
 -    'six >= 1.3.0, < 2',
 -    'jsonschema >= 2.5.1, < 3',
++    'cached-property',
 +    'docopt',
 +    'PyYAML',
 +    'requests',
@@ -26,11 +28,13 @@ diff -up docker-compose-1.5.2/setup.py.orig docker-compose-1.5.2/setup.py
  ]
  
  
-@@ -47,7 +47,7 @@
+@@ -47,8 +47,8 @@
+ 
  
  if sys.version_info[:2] < (3, 4):
-     tests_require.append('mock >= 1.0.1')
+-    tests_require.append('mock >= 1.0.1')
 -    install_requires.append('enum34 >= 1.0.4, < 2')
++    tests_require.append('mock')
 +    install_requires.append('enum34')