summaryrefslogtreecommitdiff
path: root/contrib/spec
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-06 19:27:03 +0100
committerGitHub <noreply@github.com>2020-01-06 19:27:03 +0100
commit2d8f1c8fda4d0a8b7c41addbc89f0b2f83908ec2 (patch)
treeed1a3d28f8018874564786c22b1537479464ce53 /contrib/spec
parent2e0157a2d50562cfbea1173791220aec4cbce233 (diff)
parent16b793a45aca4cee998ff65f37bebadcf51c7618 (diff)
downloadpodman-2d8f1c8fda4d0a8b7c41addbc89f0b2f83908ec2.tar.gz
podman-2d8f1c8fda4d0a8b7c41addbc89f0b2f83908ec2.tar.bz2
podman-2d8f1c8fda4d0a8b7c41addbc89f0b2f83908ec2.zip
Merge pull request #4762 from NevilleC/nc-issue4367
Generate binaries only if there are changes in src code.
Diffstat (limited to 'contrib/spec')
-rw-r--r--contrib/spec/podman.spec.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 9676a3fb4..63f569a51 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -39,7 +39,7 @@
# People want conmon packaged with the copr rpm
%global import_path_conmon github.com/containers/conmon
%global git_conmon https://%{import_path_conmon}
-%global commit_conmon 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
+%global commit_conmon d532caebc788fafdd2a305b68cd1983b4039bea4
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
Name: podman
@@ -79,7 +79,6 @@ Requires: runc
Requires: skopeo-containers
Requires: containernetworking-plugins >= 0.6.0-3
Requires: iptables
-Requires: oci-systemd-hook
%if 0%{?rhel} <= 7
Requires: container-selinux
%else