erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-10-24 23:07:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #23407 from openshift-cherrypick-robot/cherry-pick-23402-to-v5.2

Browse source 
[v5.2] [skip-ci] RPM: podman-iptables.conf only on Fedora
This commit is contained in:
openshift-merge-bot[bot] 2024-07-26 09:30:09 +00:00 • committed by GitHub
commit dbfaf236c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rpm/podman.spec
View file

@ -264,9 +264,11 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI
install.docker \
install.docker-docs \
install.remote \
install.testing \
%if %{defined _modulesloaddir}
install.modules-load
install.testing
# Only need this on Fedora until nftables becomes the default
%if %{defined fedora}
%{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load
%endif
sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker
@ -305,7 +307,7 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name}
%{_tmpfilesdir}/%{name}.conf
%{_systemdgeneratordir}/%{name}-system-generator
%{_systemdusergeneratordir}/%{name}-user-generator
%if %{defined _modulesloaddir}
%if %{defined fedora}
%{_modulesloaddir}/%{name}-iptables.conf
%endif