From 3dbbc71749247d45ab976898245674347733b641 Mon Sep 17 00:00:00 2001
From: User <user@mail.net>
Date: Wed, 6 Nov 2019 16:16:15 +0300
Subject: [PATCH] Update to 1.24.1, on Py3

---
 .abf.yml            |  1 +
 docker-compose.spec | 38 ++++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index f268065..b840704 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,3 @@
 sources:
   1.23.2.tar.gz: b27cd9abe3ebc8a5e317d726bdc17db9f9d1c775
+  compose-1.24.1.tar.gz: 567985eb37ac501feb9e3dade39a846371d104fa
diff --git a/docker-compose.spec b/docker-compose.spec
index 8839a0d..86084d6 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -1,4 +1,4 @@
-%global dcvers 1.23.2
+%global dcvers 1.24.1
 #global dcrc rc1
 %global dist_version %{dcvers}
 
@@ -11,30 +11,32 @@
 
 Name:           %{project}-%{repo}
 Version:        %{dist_version}
-Release:        2
+Release:        1
 Summary:        Multi-container orchestration for Docker
 Group:          System/Kernel and hardware
 License:        ASL 2.0
 URL:            https://www.docker.com/
 #Source0:        https://%{import_path}/archive/%{dcvers}-%{dcrc}.tar.gz
-Source0:        https://%{import_path}/archive/%{dist_version}.tar.gz
+Source0:        %{repo}-%{dist_version}.tar.gz
 
 # docker-compose is compatible with fig and is a simple rename.
 Provides:       fig = %{version}-%{release}
 Obsoletes:      fig < 1.0.0-4
 
-BuildRequires:  pkgconfig(python2)
-BuildRequires:  pythonegg(setuptools)
-BuildRequires:  pythonegg(docker)
-BuildRequires:  pythonegg(websocket-client)
-BuildRequires:  pythonegg(texttable)
-BuildRequires:  pythonegg(requests)
-BuildRequires:  pythonegg(pyyaml)
-BuildRequires:  pythonegg(docopt)
+BuildRequires:  pkgconfig(python3)
+BuildRequires:  python3egg(setuptools)
+BuildRequires:  python3egg(docker) >= 3.7.0
+BuildRequires:  python3egg(websocket-client)
+BuildRequires:  python3egg(texttable)
+BuildRequires:  python3egg(requests)
+BuildRequires:  python3egg(pyyaml)
+BuildRequires:  python3egg(docopt)
+BuildRequires:  python3egg(cached-property)
 
-Requires:       pythonegg(repoze.lru)
-Requires:       pythonegg(texttable)
-Requires:       pythonegg(setuptools)
+Requires:       python3egg(repoze.lru)
+Requires:       python3egg(texttable)
+Requires:       python3egg(setuptools)
+Requires:       python3egg(cached-property)
 
 BuildArch:      noarch
 
@@ -58,17 +60,17 @@ perl -pi -e "s|'texttable >= 0.9.0, < 0.10',|'texttable >= 1.2',|" setup.py
 perl -pi -e "s|'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',|'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',|" setup.py
 
 %build
-%{py2_build}
+%{py3_build}
 
 %install
-%{py2_install}
+%{py3_install}
 
 %files
 %doc CHANGES.md CONTRIBUTING.md README.md SWARM.md
 %doc LICENSE
 %{_bindir}/%{name}
 # Upstream uses an underscore here
-%{py_puresitedir}/docker_compose*
-%{py_puresitedir}/compose*
+%{py3_puresitedir}/docker_compose*
+%{py3_puresitedir}/compose*