import podman-3.2.3-0.10.module+el8.4.0+11989+6676f7ad

This commit is contained in:
CentOS Sources 2021-08-10 08:04:55 -04:00 committed by Andrew Lukoshko
parent b2aafea4db
commit ff3ba38550
3 changed files with 78 additions and 18 deletions

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
SOURCES/v0.1.5.tar.gz
SOURCES/v1.1.1.tar.gz
SOURCES/v3.0.1-rhel-ad1aaba.tar.gz
SOURCES/v3.2.3-rhel-78f0bd7.tar.gz

View File

@ -1,3 +1,3 @@
4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
3d883ef197eeb1a602dfef79ee1027847cfd40a4 SOURCES/v1.1.1.tar.gz
51614e209e85f259aaec4528377c5e2d8e269c87 SOURCES/v3.0.1-rhel-ad1aaba.tar.gz
d8c2223a025f6d931d412f10bbca1eedf99f3f4d SOURCES/v3.2.3-rhel-78f0bd7.tar.gz

View File

@ -13,15 +13,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
%endif
%global import_path github.com/containers/podman
%global branch v3.0.1-rhel
%global commit0 ad1aaba8df96cb25e12fe28ec96f3c131e572e3e
%global branch v3.2.3-rhel
%global commit0 78f0bd766e0f8e0e8afd1147788b8b41af165de5
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global cataver 0.1.5
%global dnsnamever 1.1.1
Name: podman
Version: 3.0.1
Release: 7%{?dist}
Version: 3.2.3
Release: 0.10%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0 and GPLv3+
URL: https://%{name}.io/
@ -40,7 +40,7 @@ BuildRequires: golang >= 1.12.12-4
BuildRequires: glib2-devel
BuildRequires: glibc-devel
BuildRequires: glibc-static
BuildRequires: git
BuildRequires: git-core
BuildRequires: go-md2man
BuildRequires: gpgme-devel
BuildRequires: libassuan-devel
@ -59,12 +59,12 @@ BuildRequires: file
BuildRequires: gcc
BuildRequires: libtool
Requires: containers-common >= 0.1.29-3
Requires: containernetworking-plugins >= 0.8.1-1
Requires: containernetworking-plugins >= 0.9.1-1
Requires: iptables
Requires: nftables
Obsoletes: oci-systemd-hook < 1
Requires: libseccomp >= 2.4.1
Requires: conmon
Requires: conmon >= 2.0.25
Requires: (container-selinux if selinux-policy)
Requires: slirp4netns >= 0.4.0-1
Requires: runc >= 1.0.0-57
@ -144,6 +144,9 @@ Requires: nmap-ncat
Requires: httpd-tools
Requires: jq
Requires: socat
Requires: skopeo
Requires: openssl
Requires: buildah
%description tests
%{summary}
@ -255,6 +258,10 @@ pushd dnsname-%{dnsnamever}
%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
popd
# install CNI
install -dp %{buildroot}%{_sysconfdir}/cni/net.d
install -p cni/87-podman-bridge.conflist %{buildroot}%{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
%check
%if 0%{?with_check}
# Since we aren't packaging up the vendor directory we need to link
@ -293,19 +300,12 @@ exit 0
%dir %{_datadir}/fish/vendor_completions.d
%{_datadir}/fish/vendor_completions.d/%{name}.fish
%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket
%{_unitdir}/%{name}-auto-update.service
%{_unitdir}/%{name}-auto-update.timer
%{_userunitdir}/%{name}.service
%{_userunitdir}/%{name}.socket
%{_userunitdir}/%{name}-auto-update.service
%{_userunitdir}/%{name}-auto-update.timer
%{_unitdir}/*
%{_userunitdir}/*
%{_usr}/lib/tmpfiles.d/%{name}.conf
%files docker
%{_bindir}/docker
%{_mandir}/man1/docker*.1*
%{_usr}/lib/tmpfiles.d/%{name}-docker.conf
%files remote
@ -338,6 +338,66 @@ exit 0
%{_datadir}/%{name}/test
%changelog
* Tue Jul 27 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.10
- update to the latest content of https://github.com/containers/podman/tree/v3.2.3-rhel
(https://github.com/containers/podman/commit/78f0bd7)
- Related: #1954702
* Mon Jul 19 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.9
- switch to v3.2.3-rhel branch
- Related: #1954702
* Wed Jul 14 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.8
- update to the latest content of https://github.com/containers/podman/tree/v3.2
(https://github.com/containers/podman/commit/4136f8b)
- Related: #1954702
* Fri Jul 09 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.7
- update to the latest content of https://github.com/containers/podman/tree/v3.2
(https://github.com/containers/podman/commit/60d12f7)
- Related: #1954702
* Thu Jul 08 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.6
- update to the latest content of https://github.com/containers/podman/tree/v3.2
(https://github.com/containers/podman/commit/275b0d8)
- Related: #1954702
* Wed Jul 07 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.5
- install CNI manually as install.cni target is missing from the Makefile
- simplify unit file packaging
- put 87-podman-bridge.conflist to main podman package not podman-remote
- Related: #1954702
* Mon Jul 05 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.4
- update to the latest content of https://github.com/containers/podman/tree/v3.2
(https://github.com/containers/podman/commit/6f0bf16)
- Related: #1954702
* Fri Jul 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.3
- install CNI properly
- Related: #1954702
* Fri Jul 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.2
- remove missing unit files
- Related: #1954702
* Fri Jul 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.1
- update to the latest content of https://github.com/containers/podman/tree/v3.2
(https://github.com/containers/podman/commit/ac740c6)
- Related: #1954702
* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.2-2
- don't install CNI (breaks the build)
- Related: #1954702
* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.2-1
- sync with the current state of 8.5.0
- Related: #1954702
* Wed Jun 30 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.2-2
- update to podman 3.2.2 from v3.2 upstream branch
- Related: #1954702
* Thu May 13 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-7
- revert back to the state of 3.0-8.4.0
- Related: #1954702