[realmd/f19] Install oddjobd appropriately when joining a domain

[Stef Walter]

commit f1f496c62715468760705b385eb61b129b6ce5d0
Author: Stef Walter <stefw at redhat.com>
Date:   Thu Jun 6 17:56:34 2013 +0200

    Install oddjobd appropriately when joining a domain

 0001-redhat-Add-dependency-on-oddjobd.patch |   47 +++++++++++++++++++++++++++
 realmd.spec                                 |    7 +++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/0001-redhat-Add-dependency-on-oddjobd.patch b/0001-redhat-Add-dependency-on-oddjobd.patch
new file mode 100644
index 0000000..4af3919
--- /dev/null
+++ b/0001-redhat-Add-dependency-on-oddjobd.patch
@@ -0,0 +1,47 @@
+From 795b6fdc7a2018bd10ab134f4b23959b6b8073e0 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at redhat.com>
+Date: Thu, 6 Jun 2013 17:23:03 +0200
+Subject: [PATCH] redhat: Add dependency on oddjobd
+
+https://bugzilla.redhat.com/show_bug.cgi?id=969441
+---
+ service/realmd-redhat.conf | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/service/realmd-redhat.conf b/service/realmd-redhat.conf
+index f64c580..4cee676 100644
+--- a/service/realmd-redhat.conf
++++ b/service/realmd-redhat.conf
+@@ -8,9 +8,13 @@ samba-common = /usr/bin/net
+ [winbind-packages]
+ samba-winbind = /usr/sbin/winbindd
+ samba-winbind-clients = /usr/bin/wbinfo
++oddjob = /usr/sbin/oddjobd
++oddjob-mkhomedir = /usr/libexec/oddjob/mkhomedir
+ 
+ [sssd-packages]
+ sssd = /usr/sbin/sssd
++oddjob = /usr/sbin/oddjobd
++oddjob-mkhomedir = /usr/libexec/oddjob/mkhomedir
+ 
+ [adcli-packages]
+ adcli = /usr/sbin/adcli
+@@ -19,7 +23,6 @@ adcli = /usr/sbin/adcli
+ freeipa-client = /usr/sbin/ipa-client-install
+ 
+ [commands]
+-# HACK: Hack around authconfig bug: https://bugzilla.redhat.com/show_bug.cgi?id=964971
+ winbind-enable-logins = /usr/bin/sh -c "/usr/sbin/authconfig --update --enablewinbind --enablewinbindauth --enablemkhomedir --nostart && /usr/bin/systemctl enable oddjobd.service"
+ winbind-disable-logins = /usr/sbin/authconfig --update --disablewinbind --disablewinbindauth --nostart
+ winbind-enable-service = /usr/bin/systemctl enable winbind.service
+@@ -27,7 +30,6 @@ winbind-disable-service = /usr/bin/systemctl disable winbind.service
+ winbind-restart-service = /usr/bin/systemctl restart winbind.service
+ winbind-stop-service = /usr/bin/systemctl stop winbind.service
+ 
+-# HACK: Hack around oddjobd bug: https://bugzilla.redhat.com/show_bug.cgi?id=964971
+ sssd-enable-logins = /usr/bin/sh -c "/usr/sbin/authconfig --update --enablesssd --enablesssdauth --enablemkhomedir --nostart && /usr/bin/systemctl enable oddjobd.service"
+ sssd-disable-logins = /usr/sbin/authconfig --update --disablesssdauth --nostart
+ sssd-enable-service = /usr/bin/systemctl enable sssd.service
+-- 
+1.8.2.1
+
diff --git a/realmd.spec b/realmd.spec
index c9ac512..e61d00f 100644
--- a/realmd.spec
+++ b/realmd.spec
@@ -1,10 +1,11 @@
 Name:		realmd
 Version:	0.14.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Kerberos realm enrollment service
 License:	LGPLv2+
 URL:		http://cgit.freedesktop.org/realmd/realmd/
 Source0:	http://www.freedesktop.org/software/realmd/releases/realmd-%{version}.tar.gz
+Patch0:		0001-redhat-Add-dependency-on-oddjobd.patch
 
 BuildRequires:	intltool pkgconfig
 BuildRequires:	gettext-devel
@@ -35,6 +36,7 @@ applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -66,6 +68,9 @@ make install DESTDIR=%{buildroot}
 %doc %{_datadir}/doc/realmd/
 
 %changelog
+* Thu Jun 06 2013 Stef Walter <stefw at redhat.com> - 0.14.2-2
+- Install oddjobd and oddjob-mkhomedir when joining domains [#969441]
+
 * Mon May 27 2013 Stef Walter <stefw at redhat.com> - 0.14.2-1
 - Update to upstream 0.14.2 version
 - Discover FreeIPA 3.0 with AD trust correctly [#966148]