From ce1fa4648a3e54afe11c9fe216332cbb4e1330be Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Jul 21 2018 21:23:24 +0000 Subject: SPEC: Move secrets responder to the package sssd-kcm The sssd secrets responder is used mainly by sssd-kcm and it is not used by any service which is in the sub-package sssd-common. Therefore it make more sense to have secrets responder in the pacakge sssd-kcm and reduce dependencies of sssd-common package (http-parser, jansson) Note: libcurl is installed anyway on fedora due to other dependencies Merges: https://pagure.io/SSSD/sssd/pull-request/3714 --- diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index f516a94..fc76f63 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -960,8 +960,6 @@ done %{_unitdir}/sssd-ssh.service %{_unitdir}/sssd-sudo.socket %{_unitdir}/sssd-sudo.service -%{_unitdir}/sssd-secrets.socket -%{_unitdir}/sssd-secrets.service %else %{_initrddir}/%{name} %endif @@ -971,9 +969,6 @@ done %{_libexecdir}/%{servicename}/sssd_nss %{_libexecdir}/%{servicename}/sssd_pam %{_libexecdir}/%{servicename}/sssd_autofs -%if (0%{?with_secrets} == 1) -%{_libexecdir}/%{servicename}/sssd_secrets -%endif %{_libexecdir}/%{servicename}/sssd_ssh %{_libexecdir}/%{servicename}/sssd_sudo %{_libexecdir}/%{servicename}/p11_child @@ -1006,9 +1001,6 @@ done %dir %{_localstatedir}/cache/krb5rcache %attr(700,sssd,sssd) %dir %{dbpath} %attr(755,sssd,sssd) %dir %{mcpath} -%if (0%{?with_secrets} == 1) -%attr(700,root,root) %dir %{secdbpath} -%endif %attr(751,sssd,sssd) %dir %{deskprofilepath} %ghost %attr(0644,sssd,sssd) %verify(not md5 size mtime) %{mcpath}/passwd %ghost %attr(0644,sssd,sssd) %verify(not md5 size mtime) %{mcpath}/group @@ -1043,9 +1035,6 @@ done %{_mandir}/man5/sssd-simple.5* %{_mandir}/man5/sssd-sudo.5* %{_mandir}/man5/sssd-session-recording.5* -%if (0%{?with_secrets} == 1) -%{_mandir}/man5/sssd-secrets.5* -%endif %{_mandir}/man8/sssd.8* %{_mandir}/man8/sss_cache.8* %if (0%{?enable_systemtap} == 1) @@ -1318,12 +1307,23 @@ done %if (0%{?with_kcm} == 1) %files kcm -f sssd_kcm.lang +%if (0%{?with_secrets} == 1) +%attr(700,root,root) %dir %{secdbpath} +%endif %{_libexecdir}/%{servicename}/sssd_kcm +%if (0%{?with_secrets} == 1) +%{_libexecdir}/%{servicename}/sssd_secrets +%endif %dir %{_datadir}/sssd-kcm %{_datadir}/sssd-kcm/kcm_default_ccache %{_unitdir}/sssd-kcm.socket %{_unitdir}/sssd-kcm.service +%{_unitdir}/sssd-secrets.socket +%{_unitdir}/sssd-secrets.service %{_mandir}/man8/sssd-kcm.8* +%if (0%{?with_secrets} == 1) +%{_mandir}/man5/sssd-secrets.5* +%endif %endif %pre common