rpms/podman
6
0
Fork 0
Code Issues Pull Requests Releases Activity

podman-3.2.3-0.2.el9

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

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2021-07-07 15:29:31 +02:00
parent bb91778fe5
commit 329fa5ce89
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
podman.spec
View File

@ -24,7 +24,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
Name: podman Name: podman
Version: 3.2.3 Version: 3.2.3
Release: 0.1%{?dist} Release: 0.2%{?dist}
Summary: Manage Pods, Containers and Container Images Summary: Manage Pods, Containers and Container Images
License: ASL 2.0 and GPLv3+ License: ASL 2.0 and GPLv3+
URL: https://%{name}.io/ URL: https://%{name}.io/
@ -232,6 +232,7 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \
install.bin-nobuild \ install.bin-nobuild \
install.remote-nobuild \ install.remote-nobuild \
install.man-nobuild \ install.man-nobuild \
install.cni \
install.systemd \ install.systemd \
install.completions \ install.completions \
install.docker install.docker
@ -260,6 +261,10 @@ pushd dnsname-%{dnsnamever}
%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
popd 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 %check
%if 0%{?with_check} %if 0%{?with_check}
# Since we aren't packaging up the vendor directory we need to link # Since we aren't packaging up the vendor directory we need to link
@ -297,14 +302,9 @@ exit 0
%{_datadir}/zsh/site-functions/_%{name} %{_datadir}/zsh/site-functions/_%{name}
%dir %{_datadir}/fish/vendor_completions.d %dir %{_datadir}/fish/vendor_completions.d
%{_datadir}/fish/vendor_completions.d/%{name}.fish %{_datadir}/fish/vendor_completions.d/%{name}.fish
%{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
%{_unitdir}/%{name}.socket %{_unitdir}/*
%{_unitdir}/%{name}-auto-update.service %{_userunitdir}/*
%{_unitdir}/%{name}-auto-update.timer
%{_userunitdir}/%{name}.service
%{_userunitdir}/%{name}.socket
%{_userunitdir}/%{name}-auto-update.service
%{_userunitdir}/%{name}-auto-update.timer
%{_usr}/lib/tmpfiles.d/%{name}.conf %{_usr}/lib/tmpfiles.d/%{name}.conf
%files docker %files docker
@ -341,6 +341,10 @@ exit 0
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%changelog %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 * 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 - update to the latest content of https://github.com/containers/podman/tree/v3.2
(https://github.com/containers/podman/commit/6f0bf16) (https://github.com/containers/podman/commit/6f0bf16)