diff --git a/.gitignore b/.gitignore index 5f24602..39e50cb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ SOURCES/podman-machine-cni-afab2d8.tar.gz SOURCES/v0.1.0.tar.gz SOURCES/v0.1.5.tar.gz SOURCES/v1.3.0.tar.gz -SOURCES/v3.3-d09259a.tar.gz +SOURCES/v3.3.1-rhel-405507a.tar.gz diff --git a/.podman.metadata b/.podman.metadata index dd564bf..a815997 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -2,4 +2,4 @@ d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz 667dcf5bea5992e18963bac6b833053a0d8b1eaa SOURCES/v1.3.0.tar.gz -860e8cce38ff643714fa24ac9da7e914f9888ea8 SOURCES/v3.3-d09259a.tar.gz +d6c846e98dbe518cd3bcafffaf04be4c75dc83ca SOURCES/v3.3.1-rhel-405507a.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 1585a1d..5f3f74d 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -16,8 +16,8 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %endif %global import_path github.com/containers/podman -%global branch v3.3 -%global commit0 d09259a1a754ab08c74b13272882a89b5c736e88 +%global branch v3.3.1-rhel +%global commit0 405507a0bb83b2881e0c0dc9d3d5bf9aa3693b7f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.5 %global dnsnamever 1.3.0 @@ -29,7 +29,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Name: podman Version: 3.3.1 -Release: 4%{?dist} +Release: 7%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -348,7 +348,8 @@ exit 0 %{_datadir}/zsh/site-functions/_%{name} %dir %{_datadir}/fish/vendor_completions.d %{_datadir}/fish/vendor_completions.d/%{name}.fish -#%%config(noreplace) %%{_sysconfdir}/cni/net.d/87-%%{name}-bridge.conflist +%ghost %dir %{_sysconfdir}/cni/net.d +%ghost %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_unitdir}/*.service %{_unitdir}/*.socket %{_unitdir}/*.timer @@ -398,6 +399,22 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Mon Aug 30 2021 Lokesh Mandvekar - 3.3.1-7 +- update to the latest content of https://github.com/containers/podman/tree/v3.3.1-rhel + (https://github.com/containers/podman/commit/405507a) +- Related: #1934415 +- correct previous changelog entry + +* Mon Aug 30 2021 Lokesh Mandvekar - 3.3.1-6 +- update to the latest content of https://github.com/containers/podman/tree/v3.3.1-rhel + (https://github.com/containers/podman/commit/405507a) +- Related: #1934415 + +* Mon Aug 30 2021 Jindrich Novy - 3.3.1-5 +- update to the latest content of https://github.com/containers/podman/tree/v3.3 + (https://github.com/containers/podman/commit/7752c73) +- Related: #1934415 + * Fri Aug 27 2021 Jindrich Novy - 3.3.1-4 - podman-gvproxy -> gvproxy - Related: #1934415