diff --git a/.gitignore b/.gitignore index 16018ca..7c5c130 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ +SOURCES/master-0a40c5a.tar.gz SOURCES/v0.1.5.tar.gz SOURCES/v1.1.1.tar.gz -SOURCES/v3.0.1-rhel-7a71903.tar.gz diff --git a/.podman.metadata b/.podman.metadata index a226f83..434beb7 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,3 +1,3 @@ +b782b31b9d5d642f30f070c7e9cd4a91410f517a SOURCES/master-0a40c5a.tar.gz 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz 3d883ef197eeb1a602dfef79ee1027847cfd40a4 SOURCES/v1.1.1.tar.gz -277c05b446f72217dfaec2d1ea021a0859d09c47 SOURCES/v3.0.1-rhel-7a71903.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 7d784be..9383903 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -13,8 +13,8 @@ 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 7a71903cbcd0e5acc8442450975de4bf64940a2a +%global branch master +%global commit0 0a40c5a059455693de0cc9a3f4a2a16722fc61e9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.5 %global dnsnamever 1.1.1 @@ -305,7 +305,6 @@ exit 0 %files docker %{_bindir}/docker -%{_mandir}/man1/docker*.1* %{_usr}/lib/tmpfiles.d/%{name}-docker.conf %files remote @@ -338,10 +337,9 @@ exit 0 %{_datadir}/%{name}/test %changelog -* Tue Mar 02 2021 Jindrich Novy - 3.0.1-3 -- update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel - (https://github.com/containers/podman/commit/7a71903) -- Resolves: #1931545 +* Wed Mar 03 2021 Jindrich Novy - 3.0.1-3 +- remove docker man page as it was removed upstream +- Related: #1934415 * Mon Feb 22 2021 Jindrich Novy - 3.0.1-2 - update to the latest content of https://github.com/containers/podman/tree/v3.0