import podman-1.6.4-23.module+el8.3.0+8233+627fbb78

This commit is contained in:
CentOS Sources 2020-09-26 08:12:45 +00:00 committed by Andrew Lukoshko
parent 716711f7a7
commit 45472f4227
3 changed files with 11 additions and 6 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/v1.6.4-rhel.tar.gz
SOURCES/podman-9650d89.tar.gz

View File

@ -1 +1 @@
f6c2cb50684b5209bbef25562afbb55f50099a21 SOURCES/v1.6.4-rhel.tar.gz
0317eab3ed31692c54f16ab9c38373d243912e3a SOURCES/podman-9650d89.tar.gz

View File

@ -14,6 +14,8 @@
%if 0%{?rhel} > 7 && ! 0%{?fedora}
%define gobuild(o:) \
go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
%else
%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
%endif
%global provider github
@ -24,19 +26,18 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
%global commit0 9eb42f31e661dc4cca05746b005b2b91d17f550b
%global commit0 9650d898817abf88b9341aab77a9280d420d027c
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: podman
Version: 1.6.4
Release: 22%{?dist}
Release: 23%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
URL: https://%{name}.io/
# Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686
ExcludeArch: i686
Source0: %{git0}/archive/%{commit0}/v1.6.4-rhel.tar.gz
Source0: %{git0}/archive/%{commit0}/podman-%{shortcommit0}.tar.gz
Provides: %{name}-manpages = %{version}-%{release}
Obsoletes: %{name}-manpages < %{version}-%{release}
BuildRequires: golang >= 1.12.12-4
@ -336,6 +337,10 @@ exit 0
%{_datadir}/%{name}/test
%changelog
* Thu Sep 24 2020 Jindrich Novy <jnovy@redhat.com> - 1.6.4-23
- fix "podman run with --rm errors out/segfaults in container-tools-2.0-8.3.0"
- Resolves: #1875289
* Fri Sep 18 2020 Jindrich Novy <jnovy@redhat.com> - 1.6.4-22
- sync with 1.6.4-rhel branch to avoid regression
- Resolves: #1879092