From f91b2e1d4d6c76a3f53ddbf63058a8145c5b9bfb Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 17 Apr 2013 10:23:37 +0200 Subject: [PATCH] Update for upstream 0.13.3 version - Add dependency on systemd for installing service file --- ...not-to-start-restart-sssd-or-winbind.patch | 37 ------------------- realmd.spec | 13 ++++--- sources | 2 +- 3 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 0001-Tell-authconfig-not-to-start-restart-sssd-or-winbind.patch diff --git a/0001-Tell-authconfig-not-to-start-restart-sssd-or-winbind.patch b/0001-Tell-authconfig-not-to-start-restart-sssd-or-winbind.patch deleted file mode 100644 index 74b6a85..0000000 --- a/0001-Tell-authconfig-not-to-start-restart-sssd-or-winbind.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05bb33fca5c6f133eaa7ccb6f79649f19d42bd7a Mon Sep 17 00:00:00 2001 -From: Stef Walter -Date: Tue, 16 Apr 2013 22:47:26 +0200 -Subject: [PATCH] Tell authconfig not to start/restart sssd or winbind - -realmd takes care of managing services as appropriate ---- - service/realmd-redhat.conf | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/service/realmd-redhat.conf b/service/realmd-redhat.conf -index d64d08e..80ec3c5 100644 ---- a/service/realmd-redhat.conf -+++ b/service/realmd-redhat.conf -@@ -20,15 +20,15 @@ adcli = /usr/sbin/adcli - freeipa-client = /usr/sbin/ipa-client-install - - [commands] --winbind-enable-logins = /usr/sbin/authconfig --update --enablewinbind --enablewinbindauth --enablemkhomedir --winbind-disable-logins = /usr/sbin/authconfig --update --disablewinbind --disablewinbindauth -+winbind-enable-logins = /usr/sbin/authconfig --update --enablewinbind --enablewinbindauth --enablemkhomedir --nostart -+winbind-disable-logins = /usr/sbin/authconfig --update --disablewinbind --disablewinbindauth --nostart - winbind-enable-service = /usr/bin/systemctl enable winbind.service - 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 - --sssd-enable-logins = /usr/sbin/authconfig --update --enablesssd --enablesssdauth --enablemkhomedir --sssd-disable-logins = /usr/sbin/authconfig --update --disablesssdauth -+sssd-enable-logins = /usr/sbin/authconfig --update --enablesssd --enablesssdauth --enablemkhomedir --nostart -+sssd-disable-logins = /usr/sbin/authconfig --update --disablesssdauth --nostart - sssd-enable-service = /usr/bin/systemctl enable sssd.service - sssd-disable-service = /usr/bin/systemctl disable sssd.service - sssd-restart-service = /usr/bin/systemctl restart sssd.service --- -1.8.2 - diff --git a/realmd.spec b/realmd.spec index f9296a6..fe59f0d 100644 --- a/realmd.spec +++ b/realmd.spec @@ -1,11 +1,10 @@ Name: realmd -Version: 0.13.2 -Release: 2%{?dist} +Version: 0.13.3 +Release: 1%{?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-Tell-authconfig-not-to-start-restart-sssd-or-winbind.patch BuildRequires: intltool pkgconfig BuildRequires: gettext-devel @@ -14,6 +13,7 @@ BuildRequires: openldap-devel BuildRequires: PackageKit-glib-devel BuildRequires: polkit-devel BuildRequires: krb5-devel +BuildRequires: systemd-devel BuildRequires: libxslt BuildRequires: xmlto @@ -33,7 +33,6 @@ applications that use %{name}. %prep %setup -q -%patch0 -p1 %build %configure @@ -50,10 +49,10 @@ make install DESTDIR=%{buildroot} %{_sysconfdir}/dbus-1/system.d/org.freedesktop.realmd.conf %{_sbindir}/realm %dir %{_libdir}/realmd -%{_libdir}/realmd/net-ads-smb.conf %{_libdir}/realmd/realmd %{_libdir}/realmd/realmd-defaults.conf %{_libdir}/realmd/realmd-distro.conf +%{_unitdir}/realmd.service %{_datadir}/dbus-1/system-services/org.freedesktop.realmd.service %{_datadir}/polkit-1/actions/org.freedesktop.realmd.policy %doc AUTHORS COPYING ChangeLog NEWS README @@ -63,6 +62,10 @@ make install DESTDIR=%{buildroot} %doc %{_datadir}/doc/realmd/ %changelog +* Wed Apr 17 2013 Stef Walter - 0.13.3-2 +- Update for upstream 0.13.3 version +- Add dependency on systemd for installing service file + * Tue Apr 16 2013 Stef Walter - 0.13.2-2 - Fix problem with sssd not starting after joining diff --git a/sources b/sources index cce941e..6b61219 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8585b8c5efd6a7aa4a5a233c02a23b8b realmd-0.13.2.tar.gz +d896dfb8bd8615fd319b537281043c4e realmd-0.13.3.tar.gz