From 7b0cbe5e727d5245a852bdfd5471e23e97061dea Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Nov 12 2015 14:56:22 +0000 Subject: Resolves: rhbz#1273893 - docker-selinux doesn't need docker to be installed first - fail silently on restorecon in post install From: Dan Walsh Signed-off-by: Lokesh Mandvekar --- diff --git a/docker.spec b/docker.spec index 6d66661..225e27d 100644 --- a/docker.spec +++ b/docker.spec @@ -64,7 +64,7 @@ Name: %{repo} Epoch: 1 Version: 1.9.0 -Release: 11.git%{d_shortcommit}%{?dist} +Release: 12.git%{d_shortcommit}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -298,7 +298,6 @@ Requires(post): policycoreutils-python-utils Requires(post): policycoreutils-python %endif Requires(post): libselinux-utils -Requires(post): %{repo} Provides: %{repo}-io-selinux = %{epoch}:%{version}-%{release} %description selinux @@ -518,7 +517,7 @@ if %{_sbindir}/selinuxenabled ; then %{_sbindir}/load_policy %relabel_files if [ $1 -eq 1 ]; then - restorecon -R %{_sharedstatedir}/%{repo} + restorecon -R %{_sharedstatedir}/%{repo} &> /dev/null || : fi fi %endif # with_selinux @@ -601,6 +600,10 @@ fi %{_bindir}/%{repo}tarsum %changelog +* Thu Nov 12 2015 Lokesh Mandvekar - 1:1.9.0-12.git1c1e196 +- Resolves: rhbz#1273893 +- From: Dan Walsh + * Thu Nov 12 2015 Jakub Čajka - 1:1.9.0-11.git1c1e196 - clean up macros overrides