From ff970b06abf095d6611b356c392697b39347ad94 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 27 Jan 2016 09:48:39 +0200 Subject: SPEC: Move polkit rules into sssd-polkit-rules subpackage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We recently added /usr/share/polkit-1/rules.d to the spec file to fix issues with unowned directories. However there is conflict with polkit package. The owner is not root. Running transaction test Error: Transaction check error: file /usr/share/polkit-1/rules.d from install of sssd-common-1.13.90-0.20160125.1503.git1b8858b.master.f +c23.x86_64 conflicts with file from package polkit-0.113-4.fc23.x86_64 Reviewed-by: Lukáš Slebodník --- contrib/sssd.spec.in | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'contrib') diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index c638078ef..08582b75e 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -518,6 +518,19 @@ Requires: sssd-common = %{version}-%{release} Provides the D-Bus responder of the SSSD, called the InfoPipe, that allows the information from the SSSD to be transmitted over the system bus. +%if (0%{?install_pcscd_polkit_rule} == 1) +%package polkit-rules +Summary: Rules for polkit integration for SSSD +Group: Applications/System +License: GPLv3+ +Requires: polkit >= 0.106 +Requires: sssd-common = %{version}-%{release} + +%description polkit-rules +Provides rules for polkit integration with SSSD. This is required +for smartcard support. +%endif + %package -n libsss_simpleifp Summary: The SSSD D-Bus responder helper library Group: Development/Libraries @@ -706,12 +719,6 @@ done %{_libexecdir}/%{servicename}/sssd_sudo %{_libexecdir}/%{servicename}/p11_child -%if (0%{?install_pcscd_polkit_rule} == 1) -%dir %{_datadir}/polkit-1 -%dir %{_datadir}/polkit-1/rules.d -%{_datadir}/polkit-1/rules.d/* -%endif - %dir %{_libdir}/%{name} %{_libdir}/%{name}/libsss_simple.so @@ -770,6 +777,11 @@ done %{_mandir}/man8/sssd.8* %{_mandir}/man8/sss_cache.8* +%if (0%{?install_pcscd_polkit_rule} == 1) +%files polkit-rules +%{_datadir}/polkit-1/rules.d/* +%endif + %files ldap -f sssd_ldap.lang %defattr(-,root,root,-) %doc COPYING -- cgit