Djam/docker-compose
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/docker-compose.git synced 2025-02-23 14:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 1.24.1, on Py3

Browse source
This commit is contained in:
User 2019-11-06 16:16:15 +03:00
parent be34a03b45
commit 3dbbc71749
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.abf.yml
View file

@ -1,2 +1,3 @@
sources: sources:
1.23.2.tar.gz: b27cd9abe3ebc8a5e317d726bdc17db9f9d1c775 1.23.2.tar.gz: b27cd9abe3ebc8a5e317d726bdc17db9f9d1c775
compose-1.24.1.tar.gz: 567985eb37ac501feb9e3dade39a846371d104fa

38
docker-compose.spec
View file

@ -1,4 +1,4 @@
%global dcvers 1.23.2 %global dcvers 1.24.1
#global dcrc rc1 #global dcrc rc1
%global dist_version %{dcvers} %global dist_version %{dcvers}
@ -11,30 +11,32 @@
Name: %{project}-%{repo} Name: %{project}-%{repo}
Version: %{dist_version} Version: %{dist_version}
Release: 2 Release: 1
Summary: Multi-container orchestration for Docker Summary: Multi-container orchestration for Docker
Group: System/Kernel and hardware Group: System/Kernel and hardware
License: ASL 2.0 License: ASL 2.0
URL: https://www.docker.com/ URL: https://www.docker.com/
#Source0: https://%{import_path}/archive/%{dcvers}-%{dcrc}.tar.gz #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. # docker-compose is compatible with fig and is a simple rename.
Provides: fig = %{version}-%{release} Provides: fig = %{version}-%{release}
Obsoletes: fig < 1.0.0-4 Obsoletes: fig < 1.0.0-4
BuildRequires: pkgconfig(python2) BuildRequires: pkgconfig(python3)
BuildRequires: pythonegg(setuptools) BuildRequires: python3egg(setuptools)
BuildRequires: pythonegg(docker) BuildRequires: python3egg(docker) >= 3.7.0
BuildRequires: pythonegg(websocket-client) BuildRequires: python3egg(websocket-client)
BuildRequires: pythonegg(texttable) BuildRequires: python3egg(texttable)
BuildRequires: pythonegg(requests) BuildRequires: python3egg(requests)
BuildRequires: pythonegg(pyyaml) BuildRequires: python3egg(pyyaml)
BuildRequires: pythonegg(docopt) BuildRequires: python3egg(docopt)
BuildRequires: python3egg(cached-property)
Requires: pythonegg(repoze.lru) Requires: python3egg(repoze.lru)
Requires: pythonegg(texttable) Requires: python3egg(texttable)
Requires: pythonegg(setuptools) Requires: python3egg(setuptools)
Requires: python3egg(cached-property)
BuildArch: noarch 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 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 %build
%{py2_build} %{py3_build}
%install %install
%{py2_install} %{py3_install}
%files %files
%doc CHANGES.md CONTRIBUTING.md README.md SWARM.md %doc CHANGES.md CONTRIBUTING.md README.md SWARM.md
%doc LICENSE %doc LICENSE
%{_bindir}/%{name} %{_bindir}/%{name}
# Upstream uses an underscore here # Upstream uses an underscore here
%{py_puresitedir}/docker_compose* %{py3_puresitedir}/docker_compose*
%{py_puresitedir}/compose* %{py3_puresitedir}/compose*