From a7d0bbeb5a8a41e80fec91d7d38b5dcb35eebe8f Mon Sep 17 00:00:00 2001 From: Alexey Tikhonov Date: Tue, 23 Jul 2024 18:07:09 +0200 Subject: [PATCH] SPEC: merge 'sssd-polkit-rules' into 'sssd-common' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'p11_child' runs under non-privileged user and thus requires polkit-rules by default. Reviewed-by: Scott Poore Reviewed-by: Sumit Bose Reviewed-by: Tomáš Halman --- contrib/sssd.spec.in | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index c65be0d27..4edabce56 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -210,6 +210,9 @@ License: GPL-3.0-or-later Obsoletes: libsss_simpleifp < 2.9.0 Obsoletes: libsss_simpleifp-debuginfo < 2.9.0 %endif +%if %{use_sssd_user} +Obsoletes: sssd-polkit-rules < 2.10.0 +%endif # Requires # due to ABI changes in 1.1.30/1.2.0 Requires: libldb >= %{ldb_version} @@ -470,19 +473,6 @@ 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 %{use_sssd_user} -%package polkit-rules -Summary: Rules for polkit integration for SSSD -Group: Applications/System -License: GPL-3.0-or-later -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 - %if 0%{?rhel} == 9 %package -n libsss_simpleifp Summary: The SSSD D-Bus responder helper library @@ -885,13 +875,11 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf %if %{use_sysusers} %{_sysusersdir}/sssd.conf %endif - - %if %{use_sssd_user} -%files polkit-rules %{_datadir}/polkit-1/rules.d/* %endif + %files ldap -f sssd_ldap.lang %license COPYING %{_libdir}/%{name}/libsss_ldap.so -- 2.45.2