podman-3.2.3-0.2.el9

- put 87-podman-bridge.conflist to main podman package not podman-remote
- Related: #1970747

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

podman.spec

@@ -24,7 +24,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 
 Name: podman
 Version: 3.2.3
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -232,6 +232,7 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \
         install.bin-nobuild \
         install.remote-nobuild \
         install.man-nobuild \
+        install.cni \
         install.systemd \
         install.completions \
         install.docker
@@ -260,6 +261,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
@@ -297,14 +302,9 @@ exit 0
 %{_datadir}/zsh/site-functions/_%{name}
 %dir %{_datadir}/fish/vendor_completions.d
 %{_datadir}/fish/vendor_completions.d/%{name}.fish
-%{_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
+%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
+%{_unitdir}/*
+%{_userunitdir}/*
 %{_usr}/lib/tmpfiles.d/%{name}.conf
 
 %files docker
@@ -341,6 +341,10 @@ exit 0
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Jul 07 2021 Jindrich Novy <jnovy@redhat.com> - 3.2.3-0.2
+- put 87-podman-bridge.conflist to main podman package not podman-remote
+- Related: #1970747
+
 * Mon Jul 05 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/6f0bf16)