From cb2b82357fd673b6f4a2f69caaf85b010ae7b3fa Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Nov 15 2014 05:28:57 +0000 Subject: Merge branch 'master' into f21 Conflicts: ca-certificates.spec --- diff --git a/ca-certificates.spec b/ca-certificates.spec index 8de2602..b89e392 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -39,7 +39,7 @@ Name: ca-certificates Version: 2014.2.1 # for Rawhide, please always use release >= 2 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...) -Release: 1.4%{?dist} +Release: 1.5%{?dist} License: Public Domain Group: System Environment/Base @@ -66,6 +66,7 @@ BuildArch: noarch Requires: p11-kit >= 0.19.2 Requires: p11-kit-trust >= 0.19.2 +Requires: coreutils Requires(post): coreutils BuildRequires: perl BuildRequires: python @@ -368,6 +369,9 @@ fi %changelog +* Sat Nov 15 2014 Peter Lemenkov - 2014.2.1-1.5 +- Restore Requires: coreutils + * Fri Nov 14 2014 Peter Lemenkov - 2014.2.1-1.4 - A proper fix for rhbz#1158343