summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobbie Harwood (frozencemetery) <rharwood@redhat.com>2015-09-23 14:02:05 +0000
committerRobbie Harwood (frozencemetery) <rharwood@redhat.com>2015-09-23 14:02:37 +0000
commit65ce267be1061e6349bb5f566b7abef0c48d7492 (patch)
tree3b319ed7b19954edd41b654c7e3bf90b535b4216
parent5ec8cb89e024ae7794e38d71dd6373f638bdd705 (diff)
downloadkrb5-65ce267be1061e6349bb5f566b7abef0c48d7492.tar.gz
krb5-65ce267be1061e6349bb5f566b7abef0c48d7492.tar.xz
krb5-65ce267be1061e6349bb5f566b7abef0c48d7492.zip
Depend on crypto-policies which provides /etc/krb5.conf.d
Resolves: rhbz#1225792
-rw-r--r--krb5.spec10
1 files changed, 6 insertions, 4 deletions
diff --git a/krb5.spec b/krb5.spec
index 94a1e25..b0d37f5 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -43,7 +43,7 @@
Summary: The Kerberos network authentication system
Name: krb5
Version: 1.13.2
-Release: 8%{?dist}
+Release: 9%{?dist}
# - Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
# - The sources below are stored in a lookaside cache. Upload with
@@ -198,6 +198,7 @@ Conflicts: libsmbclient < 3.5.10-124
%endif
Requires: coreutils, gawk, grep, sed
Requires: keyutils-libs >= 1.5.8
+Requires: crypto-policies
%description libs
Kerberos is a network authentication system. The krb5-libs package
@@ -490,8 +491,7 @@ mkdir -p $RPM_BUILD_ROOT%{_var}/kerberos/krb5/user
mkdir -p $RPM_BUILD_ROOT/etc
install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/krb5.conf
-# krb5.conf has default include on these directores.
-mkdir -p $RPM_BUILD_ROOT/etc/krb5.conf.d
+# krb5.conf has default include on this directory.
mkdir -p $RPM_BUILD_ROOT/usr/share/krb5.conf.d
# Parent of configuration file for list of loadable GSS mechs ("mechs"). This
@@ -881,7 +881,6 @@ exit 0
# These are hard-coded, not-dependent-on-the-configure-script paths.
%dir /etc/gss
%dir /etc/gss/mech.d
-%dir /etc/krb5.conf.d
%dir /usr/share/krb5.conf.d
%verify(not md5 size mtime) %config(noreplace) /etc/krb5.conf
/%{_mandir}/man5/.k5identity.5*
@@ -979,6 +978,9 @@ exit 0
%changelog
+* Wed Sep 23 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-9
+- Depend on crypto-policies which provides /etc/krb5.conf.d (#1225792)
+
* Thu Sep 10 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-8
- Remove dependency on systemd-sysv which is no longer needed for fedora > 20
This also fixes a fail-to-build issue.