The sssd-client subpackage is multilib, so it cannot contain conflicting /usr/bin executables.
It's arguable that this might belong in its own subpackage, but I'm leaning towards it not being worth its own subpackage (and all the baggage that entails). Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=790957
From d00adc1ab9f5a8747fb00ac9ee129a9a91fe58b4 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher <[email protected]> Date: Wed, 15 Feb 2012 14:48:10 -0500 Subject: [PATCH] Move sss_ssh_* binaries to the main 'sssd' package The sssd-client subpackage is multilib, so it cannot contain conflicting /usr/bin executables. --- contrib/sssd.spec.in | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 80750ae4ae6a57699e0da0f3b48161ce1827d73d..4ae4a028e11dae59e4b596899f403cdf35de7fe3 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -288,6 +288,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/%{servicename}/ %{_libdir}/%{name}/ %{ldb_modulesdir}/memberof.so +%if (0%{?enable_experimental} == 1) +%{_bindir}/sss_ssh_authorizedkeys +%{_bindir}/sss_ssh_knownhostsproxy %dir %{sssdstatedir} %dir %{_localstatedir}/cache/krb5rcache %attr(700,root,root) %dir %{dbpath} @@ -307,6 +310,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/sssd-ldap.5* %{_mandir}/man5/sssd-simple.5* %{_mandir}/man8/sssd.8* +%if (0%{?enable_experimental} == 1) +%{_mandir}/man1/sss_ssh_authorizedkeys.1* +%{_mandir}/man1/sss_ssh_knownhostsproxy.1* +%endif %{python_sitearch}/pysss.so %{python_sitelib}/*.py* @@ -316,12 +323,6 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/libnss_sss.so.2 /%{_lib}/security/pam_sss.so %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so -%if (0%{?enable_experimental} == 1) -%{_bindir}/sss_ssh_authorizedkeys -%{_bindir}/sss_ssh_knownhostsproxy -%{_mandir}/man1/sss_ssh_authorizedkeys.1* -%{_mandir}/man1/sss_ssh_knownhostsproxy.1* -%endif %{_mandir}/man8/pam_sss.8* %{_mandir}/man8/sssd_krb5_locator_plugin.8* -- 1.7.7.6
signature.asc
Description: This is a digitally signed message part
_______________________________________________ sssd-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/sssd-devel
