diff --git a/docker-compose-1.4.0.tar.gz b/docker-compose-1.4.0.tar.gz new file mode 100644 index 0000000..abfedd4 Binary files /dev/null and b/docker-compose-1.4.0.tar.gz differ diff --git a/docker-compose.spec b/docker-compose.spec index 09ce00d..303f80c 100644 --- a/docker-compose.spec +++ b/docker-compose.spec @@ -1,9 +1,9 @@ %global debug_package %{nil} Name: docker-compose -Version: 1.2.0 -Release: 3%{?dist} -Summary: Punctual, lightweight development environments using Docker +Version: 1.4.0 +Release: 1%{?dist} +Summary: Multi-container orchestration for Docker License: ASL 2.0 URL: https://www.docker.com/ @@ -41,7 +41,7 @@ Requires: PyYAML BuildArch: noarch %description -Punctual, lightweight development environments using Docker +Multi-container orchestration for Docker Docker-compose allows you to: - Define your application's environment with Docker so it can be reproduced @@ -74,6 +74,10 @@ rm -r docker_compose.egg-info %{python2_sitelib}/compose* %changelog +* Wed Aug 12 2015 Michael Hampton - 1.4.0-1 +- Update to upstream 1.4.0 +- Update Summary to match upstream summary + * Sat May 16 2015 Michael Hampton - 1.2.0-3 - Update Obsoletes EVR per packaging guidelines BZ#1213111 diff --git a/remove-requires-upper-bound.patch b/remove-requires-upper-bound.patch index 8ff0e71..46bc12d 100644 --- a/remove-requires-upper-bound.patch +++ b/remove-requires-upper-bound.patch @@ -1,17 +1,17 @@ -diff -up docker-compose-1.2.0/setup.py.orig docker-compose-1.2.0/setup.py ---- docker-compose-1.2.0/setup.py.orig 2015-04-18 18:45:31.529383904 -0400 -+++ docker-compose-1.2.0/setup.py 2015-04-18 18:47:34.171659389 -0400 +diff -up docker-compose-1.4.0/setup.py.orig docker-compose-1.4.0/setup.py +--- docker-compose-1.4.0/setup.py.orig 2015-08-11 13:15:02.000000000 -0400 ++++ docker-compose-1.4.0/setup.py 2015-08-11 20:30:12.947634912 -0400 @@ -25,14 +25,14 @@ install_requires = [ - 'docopt >= 0.6.1, < 0.7', - 'PyYAML >= 3.10, < 4', -- 'requests >= 2.2.1, < 2.6', +- 'requests >= 2.6.1, < 2.7', - 'texttable >= 0.8.1, < 0.9', -- 'websocket-client >= 0.11.0, < 1.0', -- 'docker-py >= 1.0.0, < 1.2', -- 'dockerpty >= 0.3.2, < 0.4', +- 'websocket-client >= 0.32.0, < 1.0', +- 'docker-py >= 1.3.1, < 1.4', +- 'dockerpty >= 0.3.4, < 0.4', - 'six >= 1.3.0, < 2', + 'docopt', + 'PyYAML', @@ -23,4 +23,4 @@ diff -up docker-compose-1.2.0/setup.py.orig docker-compose-1.2.0/setup.py + 'six', ] - tests_require = [ + diff --git a/sources b/sources index de2b2f3..a0071b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00bcfff7709e2701de9feb3fedffac34 docker-compose-1.2.0.tar.gz +a93e801ebe829c2f869cb23d0b606272 docker-compose-1.4.0.tar.gz