From 9a9584b78dd0722cbdfa5b6f62fc9d2a2f0a001d Mon Sep 17 00:00:00 2001 From: Chase Bolt Date: Thu, 29 Oct 2015 11:11:19 -0700 Subject: [PATCH 1/2] setting device-mapper-libs version dependency for centos 7 rpm Signed-off-by: Chase Bolt Upstream-commit: 787d94626febc306f5f0340af40c085b9a41f614 Component: engine --- components/engine/hack/make/.build-rpm/docker-engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/hack/make/.build-rpm/docker-engine.spec b/components/engine/hack/make/.build-rpm/docker-engine.spec index 767ed21627..28c6cc9d19 100644 --- a/components/engine/hack/make/.build-rpm/docker-engine.spec +++ b/components/engine/hack/make/.build-rpm/docker-engine.spec @@ -43,7 +43,7 @@ Requires: iptables Requires: libcgroup Requires: tar Requires: xz -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?centos} >= 7 # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 %endif From 873a58e636415d7ba2102621165a4697ebc12618 Mon Sep 17 00:00:00 2001 From: Chase Bolt Date: Thu, 29 Oct 2015 15:23:44 -0700 Subject: [PATCH 2/2] expand the list a bit more Signed-off-by: Chase Bolt Upstream-commit: d8aaf962169e2c6070d178bb754b0171b45e2328 Component: engine --- components/engine/hack/make/.build-rpm/docker-engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/hack/make/.build-rpm/docker-engine.spec b/components/engine/hack/make/.build-rpm/docker-engine.spec index 28c6cc9d19..d189fcd988 100644 --- a/components/engine/hack/make/.build-rpm/docker-engine.spec +++ b/components/engine/hack/make/.build-rpm/docker-engine.spec @@ -43,7 +43,7 @@ Requires: iptables Requires: libcgroup Requires: tar Requires: xz -%if 0%{?fedora} >= 21 || 0%{?centos} >= 7 +%if 0%{?fedora} >= 21 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?oraclelinux} >= 7 # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 %endif