summaryrefslogtreecommitdiff
path: root/contrib/spec/podman.spec.in
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-06-29 10:40:08 -0400
committerGitHub <noreply@github.com>2021-06-29 10:40:08 -0400
commit599b7d746a6ccad6ebbd70abb72be30bead094a6 (patch)
tree31451b0b94962ed37507fa2ccab3d849e9acbaac /contrib/spec/podman.spec.in
parentc260cbd29d831597df660fcf095e9db587ab856a (diff)
parent1edada477dbd30b360b54ddabfceab92f1993075 (diff)
downloadpodman-599b7d746a6ccad6ebbd70abb72be30bead094a6.tar.gz
podman-599b7d746a6ccad6ebbd70abb72be30bead094a6.tar.bz2
podman-599b7d746a6ccad6ebbd70abb72be30bead094a6.zip
Merge pull request #10803 from lsm5/remove-cni-conflist
Makefile: remove install.cni
Diffstat (limited to 'contrib/spec/podman.spec.in')
-rw-r--r--contrib/spec/podman.spec.in2
1 files changed, 0 insertions, 2 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index ef8523f8c..fa513932f 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -441,7 +441,6 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build
%if %{with doc}
install.man-nobuild \
%endif
- install.cni \
install.systemd \
install.completions
@@ -526,7 +525,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_datadir}/bash-completion/completions/*
%{_datadir}/zsh/site-functions/*
%{_datadir}/fish/vendor_completions.d/*
-%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
%{_unitdir}/podman-auto-update.service
%{_unitdir}/podman-auto-update.timer
%{_unitdir}/podman.service