summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Mainz <rmainz@redhat.com>2015-06-19 18:22:15 +0200
committerRoland Mainz <rmainz@redhat.com>2015-06-19 18:22:15 +0200
commit168ec0c9e7a7e003716df9201c09427961570244 (patch)
tree82bba5c7bbf17dc8a7a526815e68208b258b1be4
parent57f951a0e2f87d1a1931d2d228fbbcdd76f65865 (diff)
downloadkrb5-168ec0c9e7a7e003716df9201c09427961570244.tar.gz
krb5-168ec0c9e7a7e003716df9201c09427961570244.tar.xz
krb5-168ec0c9e7a7e003716df9201c09427961570244.zip
* Thu Jun 18 2015 Roland Mainz <rmainz@redhat.com> - 1.13.2-4
- Fix dependicy on binfmt.service
-rw-r--r--kadmin.service1
-rw-r--r--krb5.spec11
2 files changed, 11 insertions, 1 deletions
diff --git a/kadmin.service b/kadmin.service
index ede159e..5975a35 100644
--- a/kadmin.service
+++ b/kadmin.service
@@ -1,5 +1,6 @@
[Unit]
Description=Kerberos 5 Password-changing and Administration
+Requires=systemd-binfmt.service
After=syslog.target network.target
[Service]
diff --git a/krb5.spec b/krb5.spec
index bc454f2..5a2efc9 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -43,7 +43,7 @@
Summary: The Kerberos network authentication system
Name: krb5
Version: 1.13.2
-Release: 3%{?dist}
+Release: 4%{?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
@@ -136,6 +136,7 @@ BuildRequires: keyutils, keyutils-libs-devel >= 1.5.8
BuildRequires: libselinux-devel
BuildRequires: pam-devel
%if %{WITH_SYSTEMD}
+BuildRequires: systemd
BuildRequires: systemd-units
%endif
# For the test framework.
@@ -210,6 +211,9 @@ Summary: The KDC and related programs for Kerberos 5
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires(post): chkconfig
%if %{WITH_SYSTEMD}
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
Requires(post): systemd-sysv
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -715,9 +719,11 @@ fi
%postun server-ldap -p /sbin/ldconfig
%post server
+%systemd_post systemd-binfmt.service
# Remove the init script for older servers.
[ -x /etc/rc.d/init.d/krb5server ] && /sbin/chkconfig --del krb5server
%if %{WITH_SYSTEMD}
+/bin/systemctl restart systemd-binfmt.service
if (( $1 == 1 )) ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -1013,6 +1019,9 @@ exit 0
%changelog
+* Thu Jun 18 2015 Roland Mainz <rmainz@redhat.com> - 1.13.2-4
+- Fix dependicy on binfmt.service
+
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild