From 3f50907e475484e7a803c2b1b250d01b32d31bf6 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Dec 27 2017 00:32:22 +0000
Subject: Latest upstream


- Drop patch0 and patch1, use sed on setup.py instead
- Rebase patch2

---

diff --git a/.gitignore b/.gitignore
index 01e2520..cd3061d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /docker-compose-1.16.1.tar.gz
 /docker-compose-1.17.0.tar.gz
 /docker-compose-1.17.1.tar.gz
+/docker-compose-1.18.0.tar.gz
diff --git a/allow-older-requests.patch b/allow-older-requests.patch
deleted file mode 100644
index c284ebd..0000000
--- a/allow-older-requests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nurp docker-compose-1.16.1.orig/setup.py docker-compose-1.16.1/setup.py
---- docker-compose-1.16.1.orig/setup.py	2017-09-10 18:11:17.853724032 -0500
-+++ docker-compose-1.16.1/setup.py	2017-09-10 18:17:23.425757123 -0500
-@@ -33,7 +33,7 @@ install_requires = [
-     'cached-property >= 1.2.0',
-     'docopt >= 0.6.1',
-     'PyYAML >= 3.10',
--    'requests >= 2.6.1, != 2.11.0',
-+    'requests >= 2.6.0, != 2.11.0',
-     'texttable >= 0.9.0',
-     'websocket-client >= 0.32.0',
-     'docker >= 2.5.1',
diff --git a/allow-older-setuptools.patch b/allow-older-setuptools.patch
index 68ad114..b898547 100644
--- a/allow-older-setuptools.patch
+++ b/allow-older-setuptools.patch
@@ -1,11 +1,11 @@
 Upstream uses environment markers to conditionally apply some dependencies.
 Environment markers were first added in setuptools 20.6.8.
 
-diff -Nurp docker-compose-1.16.1.orig/setup.py docker-compose-1.16.1/setup.py
---- docker-compose-1.16.1.orig/setup.py	2017-09-10 18:33:56.293844235 -0500
-+++ docker-compose-1.16.1/setup.py	2017-09-10 18:47:08.124932179 -0500
+diff -Nurp docker-compose-1.18.0.orig/setup.py docker-compose-1.18.0/setup.py
+--- docker-compose-1.18.0.orig/setup.py	2017-12-06 19:34:46.000000000 -0600
++++ docker-compose-1.18.0/setup.py	2017-12-26 18:09:04.896020834 -0600
 @@ -42,6 +42,17 @@ install_requires = [
-     'jsonschema >= 2.5.1',
+     'jsonschema >= 2.5.1, < 3',
  ]
  
 +if sys.version_info[:2] < (3, 4):
@@ -18,7 +18,7 @@ diff -Nurp docker-compose-1.16.1.orig/setup.py docker-compose-1.16.1/setup.py
 +    install_requires.append('ipaddress >= 1.0.16')
 +
 +if sys.platform == 'win32':
-+    install_requires.append('colorama >= 0.3.7')
++    install_requires.append('colorama >= 0.3.9')
  
  tests_require = [
      'pytest',
@@ -29,7 +29,7 @@ diff -Nurp docker-compose-1.16.1.orig/setup.py docker-compose-1.16.1/setup.py
 -    ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
 -    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
 -    ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
--    ':sys_platform == "win32"': ['colorama >= 0.3.7, < 0.4'],
+-    ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
      'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
  }
  
diff --git a/docker-compose.spec b/docker-compose.spec
index e66a53a..472d94e 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -8,7 +8,7 @@
 %endif
 
 Name:           docker-compose
-Version:        1.17.1
+Version:        1.18.0
 Release:        1%{?dist}
 Summary:        Multi-container orchestration for Docker
 
@@ -16,12 +16,6 @@ License:        ASL 2.0
 URL:            https://github.com/docker/compose
 Source0:        https://files.pythonhosted.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
 
-# Remove dependency version constraints not relevant in Fedora/EPEL
-Patch0:         remove-requires-upper-bound.patch
-
-# https://github.com/docker/compose/issues/4884
-Patch1:         allow-older-requests.patch
-
 # Upstream uses environment markers to conditionally apply some dependencies.
 # Environment markers were first added in setuptools 20.6.8.
 Patch2:         allow-older-setuptools.patch
@@ -42,7 +36,7 @@ Requires:       python%{?python3_pkgversion}-yaml >= 3.10
 Requires:       python%{?python3_pkgversion}-requests >= 2.6.0
 Requires:       python%{?python3_pkgversion}-texttable >= 0.9.0
 Requires:       python%{?python3_pkgversion}-websocket-client >= 0.32.0
-Requires:       python%{?python3_pkgversion}-docker >= 2.5.1
+Requires:       python%{?python3_pkgversion}-docker >= 2.6.1
 Requires:       python%{?python3_pkgversion}-dockerpty >= 0.4.1
 Requires:       python%{?python3_pkgversion}-six >= 1.3.0
 Requires:       python%{?python3_pkgversion}-jsonschema >= 2.5.1
@@ -80,6 +74,12 @@ Using Compose is basically a three-step process.
 %prep
 %autosetup -p 1
 
+# Remove dependency version constraints not relevant in Fedora/EPEL
+sed -e 's/, < [0-9.]\+//' -i setup.py
+
+# https://github.com/docker/compose/issues/4884
+sed -e '/requests >= / s/2\.6\.1/2.6.0/' -i setup.py
+
 # Upstream uses an underscore here
 rm -r docker_compose.egg-info
 
@@ -114,6 +114,11 @@ install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_
 %{_datadir}/fish
 
 %changelog
+* Tue Dec 26 2017 Carl George <carl@george.computer> - 1.18.0-1
+- Latest upstream
+- Drop patch0 and patch1, use sed on setup.py instead
+- Rebase patch2
+
 * Thu Nov  9 2017 Michael Hampton <error@ioerror.us> - 1.17.1-1
 - Update to 1.17.1 (#1511455)
 
diff --git a/remove-requires-upper-bound.patch b/remove-requires-upper-bound.patch
deleted file mode 100644
index 5ebd0fc..0000000
--- a/remove-requires-upper-bound.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -up docker-compose-1.16.1/requirements.txt.orig docker-compose-1.16.1/requirements.txt
---- docker-compose-1.16.1/requirements.txt.orig	2017-09-01 20:21:41.875817539 -0400
-+++ docker-compose-1.16.1/requirements.txt	2017-09-01 20:23:20.570712260 -0400
-@@ -1,22 +1,21 @@
--backports.ssl-match-hostname==3.5.0.1; python_version < '3'
--cached-property==1.3.0
--certifi==2017.4.17
--chardet==3.0.4
--colorama==0.3.9; sys_platform == 'win32'
--docker==2.5.1
--docker-pycreds==0.2.1
--dockerpty==0.4.1
--docopt==0.6.2
--enum34==1.1.6; python_version < '3.4'
--functools32==3.2.3.post2; python_version < '3.2'
--idna==2.5
--ipaddress==1.0.18
--jsonschema==2.6.0
--pypiwin32==219; sys_platform == 'win32'
--PySocks==1.6.7
--PyYAML==3.12
--requests==2.11.1
--six==1.10.0
--texttable==0.9.1
--urllib3==1.21.1
--websocket-client==0.32.0
-+backports.ssl-match-hostname; python_version < '3'
-+cached-property
-+chardet
-+colorama; sys_platform == 'win32'
-+docker
-+docker-pycreds
-+dockerpty
-+docopt
-+enum34; python_version < '3.4'
-+functools32; python_version < '3.2'
-+idna
-+ipaddress
-+jsonschema
-+pypiwin32; sys_platform == 'win32'
-+PySocks
-+PyYAML
-+requests
-+six
-+texttable
-+urllib3
-+websocket-client
-diff -up docker-compose-1.16.1/setup.py.orig docker-compose-1.16.1/setup.py
---- docker-compose-1.16.1/setup.py.orig	2017-09-01 20:21:41.875817539 -0400
-+++ docker-compose-1.16.1/setup.py	2017-09-01 20:24:26.305669394 -0400
-@@ -30,16 +30,16 @@ def find_version(*file_paths):
- 
- 
- install_requires = [
--    'cached-property >= 1.2.0, < 2',
--    'docopt >= 0.6.1, < 0.7',
--    'PyYAML >= 3.10, < 4',
--    'requests >= 2.6.1, != 2.11.0, < 2.12',
--    'texttable >= 0.9.0, < 0.10',
--    'websocket-client >= 0.32.0, < 1.0',
--    'docker >= 2.5.1, < 3.0',
--    'dockerpty >= 0.4.1, < 0.5',
--    'six >= 1.3.0, < 2',
--    'jsonschema >= 2.5.1, < 3',
-+    'cached-property >= 1.2.0',
-+    'docopt >= 0.6.1',
-+    'PyYAML >= 3.10',
-+    'requests >= 2.6.1, != 2.11.0',
-+    'texttable >= 0.9.0',
-+    'websocket-client >= 0.32.0',
-+    'docker >= 2.5.1',
-+    'dockerpty >= 0.4.1',
-+    'six >= 1.3.0',
-+    'jsonschema >= 2.5.1',
- ]
- 
- 
diff --git a/sources b/sources
index a7dc2d4..e32dd19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (docker-compose-1.17.1.tar.gz) = 711c0a73546f0b396a920d3310b92fc15e3c13f93439eeda363124c9bd971aa942395b2405ad7441df8982384be367c20a767fe5b9e3e150690b63deda58f553
+SHA512 (docker-compose-1.18.0.tar.gz) = 9cf29d892f6419e9ef639e1b9edddecb47ddb5ba7f97830f732e463ee510ac5464d6d81f58a2bf4ae5e7aee78b3d2d4afd59e6e1b53974899edb3e090bcb991f