From d4d62530512b24b77750e3d37a55a4bd1c1828cb Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 21:52:41 +0100 Subject: [PATCH] update to 2.5.0 [release 2.5.0-1mamba;Sat May 07 2022] --- docker-compose.spec | 50 ++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/docker-compose.spec b/docker-compose.spec index d8a2c7f..5838fe3 100644 --- a/docker-compose.spec +++ b/docker-compose.spec @@ -1,5 +1,5 @@ Name: docker-compose -Version: 1.29.2 +Version: 2.5.0 Release: 1mamba Summary: Define and run multi-container applications with Docker Group: System/Servers @@ -7,22 +7,9 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/docker/compose -Source: https://github.com/docker/compose.git/%{version}/compose-%{version}.tar.bz2 +Source: https://github.com/docker/compose.git/v%{version}/compose-%{version}.tar.bz2 License: Apache License 2.0 ## AUTOBUILDREQ-BEGIN -BuildRequires: libpython3-devel -BuildRequires: python3.7dist(cached-property) -BuildRequires: python3.7dist(distro) -BuildRequires: python3.7dist(docker) -BuildRequires: python3.7dist(dockerpty) -BuildRequires: python3.7dist(docopt) -BuildRequires: python3.7dist(jsonschema) -BuildRequires: python3.7dist(python-dotenv) -BuildRequires: python3.7dist(pyyaml) -BuildRequires: python3.7dist(requests) -BuildRequires: python3.7dist(setuptools) -BuildRequires: python3.7dist(texttable) -BuildRequires: python3.7dist(websocket-client) ## AUTOBUILDREQ-END %description @@ -32,38 +19,27 @@ Define and run multi-container applications with Docker. %setup -q -n compose-%{version} %build -CFLAGS="%{optflags}" %{__python3} setup.py build +export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -ldflags=-X=github.com/docker/compose/v2/internal.Version=%{version} -mod=readonly -modcacherw" +CGO_ENABLED=0 go build -trimpath -tags "e2e,kube" -o compose ./cmd %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%{__python3} setup.py install \ - -O1 --skip-build \ - --root="%{buildroot}" \ - --install-headers=%{python3_inc} \ - --install-lib=%{python3_sitearch} \ - --record=%{name}.filelist - -sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist - -install -Dm644 contrib/completion/bash/docker-compose \ - %{buildroot}%{_datadir}/bash-completion/completions/docker-compose -install -Dm644 contrib/completion/fish/docker-compose.fish \ - %{buildroot}%{_datadir}/fish/vendor_completions.d/docker-compose.fish -install -Dm644 contrib/completion/zsh/_docker-compose \ - %{buildroot}%{_datadir}/zsh/site-functions/_docker-compose +install -D -m0755 compose %{buildroot}%{_prefix}/lib/docker/cli-plugins/docker-compose +install -d %{buildroot}%{_bindir} +ln -sf ../lib/docker/cli-plugins/docker-compose %{buildroot}%{_bindir}/docker-compose %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%files -f %{name}.filelist +%files %defattr(-,root,root) -%dir %{python3_sitearch}/docker_compose-%{version}-py*.egg-info -%{python3_sitearch}/docker_compose-%{version}-py*.egg-info/* -%{_datadir}/bash-completion/completions/docker-compose -%{_datadir}/fish/vendor_completions.d/docker-compose.fish -%{_datadir}/zsh/site-functions/_docker-compose +%{_bindir}/docker-compose +%{_prefix}/lib/docker/cli-plugins/docker-compose %doc LICENSE %changelog +* Sat May 07 2022 Silvan Calarco 2.5.0-1mamba +- update to 2.5.0 + * Sun Aug 29 2021 Silvan Calarco 1.29.2-1mamba - package created using the webbuild interface