commit 9a5ce844c475b741199bd9c624643db1bad942bd
Author: Jan Palus <[email protected]>
Date: Thu Aug 22 00:12:10 2024 +0200
up to 2.29.2
docker-compose.spec | 64 ++++++++++++---------------
remove-requires-upper-bound.patch | 91 ---------------------------------------
2 files changed, 27 insertions(+), 128 deletions(-)
---
diff --git a/docker-compose.spec b/docker-compose.spec
index 6fd6405..6533741 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -1,38 +1,24 @@
-#
-# Conditional build:
-%bcond_with tests # do not perform "make test"
+%define vendor_version 2.29.2
-%define module compose
-%define egg_name docker_compose
-%define pypi_name docker-compose
Summary: Multi-container orchestration for Docker
Name: docker-compose
-Version: 1.29.2
-Release: 4
+Version: 2.29.2
+Release: 1
License: Apache v2.0
Group: Applications/System
# https://github.com/docker/compose/releases
-Source0:
https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
-# Source0-md5: 95accbca655abf086a61b94d6c3d94ca
-Patch0: remove-requires-upper-bound.patch
+Source0:
https://github.com/docker/compose/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 98a9b86671ed78e40a85a8082cc97c0c
+Source1: %{name}-vendor-%{vendor_version}.tar.xz
+# Source1-md5: f11756768fbb007d0d354d35f82c41b7
+Source2: docker-compose.sh
URL: https://docs.docker.com/compose/
-%if %{with tests}
-BuildRequires: python3-PyYAML
-BuildRequires: python3-docker
-BuildRequires: python3-docopt
-BuildRequires: python3-paramiko
-BuildRequires: python3-requests
-BuildRequires: python3-setuptools
-BuildRequires: python3-texttable
-BuildRequires: python3-websocket-client
-%endif
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.714
-Requires: docker(engine) >= 1.10.0
-Requires: python3-docker >= 4.4.4
-Requires: python3-paramiko >= 2.4.2
-Requires: python3-setuptools
-BuildArch: noarch
+BuildRequires: golang >= 1.21.0
+BuildRequires: rpmbuild(macros) >= 2.009
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires: docker-ce-cli
+ExclusiveArch: %go_arches
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -47,24 +33,28 @@ Docker-compose allows you to:
entire app.
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n compose-%{version} -a1
-rm -r docker_compose.egg-info
+%{__mv} compose-%{vendor_version}/vendor .
%build
-%py3_build
+%{__make} \
+ VERSION="%{version}" \
+ BUILD_FLAGS="-v -mod=vendor"
%install
rm -rf $RPM_BUILD_ROOT
-%py3_install
+
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libexecdir}/docker/cli-plugins}
+
+cp -p bin/build/docker-compose $RPM_BUILD_ROOT%{_libexecdir}/docker/cli-plugins
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/docker-compose
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGELOG.md CONTRIBUTING.md README.md SWARM.md LICENSE
-%attr(755,root,root) %{_bindir}/%{name}
-%{py3_sitescriptdir}/%{module}
-%{py3_sitescriptdir}/%{egg_name}-%{version}-py*.egg-info
+%doc CONTRIBUTING.md README.md LICENSE
+%attr(755,root,root) %{_bindir}/docker-compose
+%attr(755,root,root) %{_libexecdir}/docker/cli-plugins/docker-compose
diff --git a/remove-requires-upper-bound.patch
b/remove-requires-upper-bound.patch
deleted file mode 100644
index 1ecd5c8..0000000
--- a/remove-requires-upper-bound.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- docker-compose-1.27.0/requirements.txt.orig 2020-09-07
22:15:24.818988058 +0200
-+++ docker-compose-1.27.0/requirements.txt 2020-09-07 22:17:28.372476931
+0200
-@@ -1,22 +1,22 @@
--backports.shutil_get_terminal_size==1.0.0
--cached-property==1.5.1; python_version < '3.8'
--certifi==2020.6.20
--chardet==3.0.4
--colorama==0.4.3; sys_platform == 'win32'
--distro==1.5.0
--docker==5.0.0
--docker-pycreds==0.4.0
--dockerpty==0.4.1
--docopt==0.6.2
--idna==2.10
--ipaddress==1.0.23
--jsonschema==3.2.0
--paramiko==2.7.1
--PySocks==1.7.1
--python-dotenv==0.17.0
--pywin32==227; sys_platform == 'win32'
--PyYAML==5.4.1
--requests==2.24.0
--texttable==1.6.2
--urllib3==1.25.10; python_version == '3.3'
--websocket-client==0.57.0
-+backports.shutil_get_terminal_size
-+cached-property; python_version < '3.8'
-+certifi
-+chardet
-+colorama; sys_platform == 'win32'
-+distro
-+docker
-+docker-pycreds
-+dockerpty
-+docopt
-+idna
-+ipaddress
-+jsonschema
-+paramiko
-+PySocks
-+python-dotenv
-+pywin32; sys_platform == 'win32'
-+PyYAML
-+requests
-+texttable
-+urllib3; python_version == '3.3'
-+websocket-client
---- docker-compose-1.27.0/setup.py.orig 2020-09-07 22:15:24.818988058
+0200
-+++ docker-compose-1.27.0/setup.py 2020-09-07 22:19:17.642592487 +0200
-@@ -25,16 +25,16 @@
-
-
- install_requires = [
-- 'docopt >= 0.6.1, < 1',
-- 'PyYAML >= 3.10, < 6',
-- 'requests >= 2.20.0, < 3',
-- 'texttable >= 0.9.0, < 2',
-- 'websocket-client >= 0.32.0, < 1',
-- 'distro >= 1.5.0, < 2',
-- 'docker[ssh] >= 5',
-- 'dockerpty >= 0.4.1, < 1',
-- 'jsonschema >= 2.5.1, < 4',
-- 'python-dotenv >= 0.13.0, < 1',
-+ 'docopt >= 0.6.1',
-+ 'PyYAML >= 3.10',
-+ 'requests >= 2.20.0',
-+ 'texttable >= 0.9.0',
-+ 'websocket-client >= 0.32.0',
-+ 'distro >= 1.5.0',
-+ 'docker[ssh] >= 5',
-+ 'dockerpty >= 0.4.1',
-+ 'jsonschema >= 2.5.1',
-+ 'python-dotenv >= 0.13.0',
- ]
-
-
-@@ -49,10 +49,10 @@
- tests_require.append('mock >= 1.0.1, < 4')
-
- extras_require = {
-- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
-- ':python_version < "3.8"': ['cached-property >= 1.2.0, < 2'],
-- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
-- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
-+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
-+ ':python_version < "3.8"': ['cached-property >= 1.2.0'],
-+ ':sys_platform == "win32"': ['colorama >= 0.4'],
-+ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
- 'tests': tests_require,
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/docker-compose.git/commitdiff/9a5ce844c475b741199bd9c624643db1bad942bd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
