podman-4.4.0-0.3.el9

- remove podman-machine-cni, it is now part of podman 4.0 or newer
- Related: #2124478

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

podman.spec

@@ -14,13 +14,11 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 %global gvproxyrepo gvisor-tap-vsock
 %global gvproxyver 0.5.0
 %global commit_gvproxy aab0ac9367fc5142f5857c36ac2352bcb3c60ab7
-%global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51
-%global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7})
 
 Epoch: 2
 Name: podman
 Version: 4.4.0
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -32,7 +30,6 @@ Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcom
 Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz
 #Source2: https://github.com/containers/dnsname/archive/v%%{dnsnamever}.tar.gz
 Source2: https://github.com/containers/dnsname/archive/%{commit_dnsname}/dnsname-%{shortcommit_dnsname}.tar.gz
-Source3: https://github.com/containers/%{name}-machine-cni/archive/%{commit_mcni}/%{name}-machine-cni-%{shortcommit_mcni}.tar.gz
 Source4: https://github.com/containers/gvisor-tap-vsock/archive/%{commit_gvproxy}/gvisor-tap-vsock-%{commit_gvproxy}.tar.gz
 # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
 ExclusiveArch: %{go_arches}
@@ -168,7 +165,6 @@ pushd catatonit-%{cataver}
 sed -i '$d' configure.ac
 popd
 tar fx %{SOURCE2}
-tar fx %{SOURCE3}
 tar fx %{SOURCE4}
 
 # this is shipped by skopeo: containers-common subpackage
@@ -243,17 +239,6 @@ export GOPATH=$(pwd)/_build:$(pwd)
 %gobuild -o bin/dnsname github.com/containers/dnsname/plugins/meta/dnsname
 popd
 
-pushd %{name}-machine-cni-%{commit_mcni}
-mkdir _build
-pushd _build
-mkdir -p src/github.com/containers
-ln -s ../../../../ src/github.com/containers/%{name}-machine-cni
-popd
-ln -s vendor src
-export GOPATH=$(pwd)/_build:$(pwd)
-%gobuild -o bin/%{name}-machine github.com/containers/%{name}-machine-cni/plugins/meta/%{name}-machine
-popd
-
 pushd gvisor-tap-vsock-%{commit_gvproxy}
 mkdir _build
 pushd _build
@@ -296,11 +281,6 @@ pushd dnsname-%{commit_dnsname}
 %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
 popd
 
-# install machine-cni plugin
-pushd %{name}-machine-cni-%{commit_mcni}
-%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
-popd
-
 # install gvproxy
 pushd gvisor-tap-vsock-%{commit_gvproxy}
 install -dp %{buildroot}%{_libexecdir}/%{name}
@@ -391,7 +371,6 @@ fi
 %license dnsname-%{commit_dnsname}/LICENSE
 %doc dnsname-%{commit_dnsname}/{README.md,README_PODMAN.md}
 %{_libexecdir}/cni/dnsname
-%{_libexecdir}/cni/%{name}-machine
 
 %files tests
 %license LICENSE
@@ -404,6 +383,10 @@ fi
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
+* Tue Jan 17 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.4.0-0.3
+- remove podman-machine-cni, it is now part of podman 4.0 or newer
+- Related: #2124478
+
 * Tue Jan 17 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.4.0-0.2
 - update to the latest content of https://github.com/containers/podman/tree/main
   (https://github.com/containers/podman/commit/07ba51d)

sources

@@ -1,5 +1,4 @@
 SHA512 (v0.1.7.tar.gz) = 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67
 SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
-SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4
 SHA512 (gvisor-tap-vsock-aab0ac9367fc5142f5857c36ac2352bcb3c60ab7.tar.gz) = e138125f0fad46f84afebad5769d4428cb29f24ce34e209b21689dc4409487bf2e946c9eb6551297baf36286c9be9a5310a77df4884563cfe247113980f18291
 SHA512 (main-07ba51d.tar.gz) = 643ee0359c94a4a98c87c97121a2bf542046498daf0c04c5d450eb12f6f0aec12f413c06065dfca5d6c03618ebb63452d201f8f8144a1b0e6cb9ec1551974d11