diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 428e7cc47d2..be6954353ed 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -579,9 +579,6 @@ unset CK_TIMEOUT_MULTIPLIER %make_install -# Prepare language files -/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sssd - # Copy default logrotate file mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d install -m644 src/examples/logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sssd @@ -622,35 +619,8 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm -f {} \; # Suppress developer-only documentation rm -Rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name} -# Older versions of rpmbuild can only handle one -f option -# So we need to append to the sssd*.lang file -for file in `find $RPM_BUILD_ROOT/%{python3_sitelib} -maxdepth 1 -name "*.egg-info" 2> /dev/null` -do - echo %{python3_sitelib}/`basename $file` >> python3_sssdconfig.lang -done - -touch sssd.lang -for subpackage in sssd_ldap sssd_krb5 sssd_ipa sssd_ad sssd_proxy sssd_tools \ - sssd_client sssd_dbus sssd_nfs_idmap sssd_winbind_idmap \ - libsss_certmap sssd_kcm -do - touch $subpackage.lang -done - -# Print these to the rpmbuild log -echo "sssd.lang:" -cat sssd.lang - -echo "python3_sssdconfig.lang:" -cat python3_sssdconfig.lang - -for subpackage in sssd_ldap sssd_krb5 sssd_ipa sssd_ad sssd_proxy sssd_tools \ - sssd_client sssd_dbus sssd_nfs_idmap sssd_winbind_idmap \ - libsss_certmap sssd_kcm -do - echo "$subpackage.lang:" - cat $subpackage.lang -done +rm -Rf ${RPM_BUILD_ROOT}/usr/share/locale/* +rm -Rf ${RPM_BUILD_ROOT}/%{python3_sitelib}/SSSDConfig-*egg-info %if %{use_sysusers} install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.conf @@ -659,7 +629,7 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con %files %license COPYING -%files common -f sssd.lang +%files common %license COPYING %doc src/examples/sssd-example.conf %{_sbindir}/sssd @@ -735,7 +705,7 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con %{_datadir}/polkit-1/rules.d/* %endif -%files ldap -f sssd_ldap.lang +%files ldap %license COPYING %{_libdir}/%{name}/libsss_ldap.so @@ -745,7 +715,7 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con %attr(0750,root,%{sssd_user}) %caps(%{child_capabilities}) %{_libexecdir}/%{servicename}/ldap_child %attr(0750,root,%{sssd_user}) %caps(%{child_capabilities}) %{_libexecdir}/%{servicename}/krb5_child -%files krb5 -f sssd_krb5.lang +%files krb5 %license COPYING %{_libdir}/%{name}/libsss_krb5.so %config(noreplace) %{_sysconfdir}/krb5.conf.d/enable_sssd_conf_dir @@ -756,12 +726,12 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con %license COPYING %{_libexecdir}/%{servicename}/sssd_pac -%files ipa -f sssd_ipa.lang +%files ipa %license COPYING %attr(770,%{sssd_user},%{sssd_user}) %dir %{keytabdir} %{_libdir}/%{name}/libsss_ipa.so -%files ad -f sssd_ad.lang +%files ad %license COPYING %{_libdir}/%{name}/libsss_ad.so %{_libexecdir}/%{servicename}/gpo_child @@ -771,14 +741,14 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con %{_libexecdir}/%{servicename}/proxy_child %{_libdir}/%{name}/libsss_proxy.so -%files dbus -f sssd_dbus.lang +%files dbus %license COPYING %{_libexecdir}/%{servicename}/sssd_ifp # InfoPipe DBus plumbing %{_datadir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf %{_datadir}/dbus-1/system-services/org.freedesktop.sssd.infopipe.service -%files client -f sssd_client.lang +%files client %license src/sss_client/COPYING src/sss_client/COPYING.LESSER %{_libdir}/libnss_sss.so.2 %if %{build_subid} @@ -805,7 +775,7 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con %dir %{_libdir}/%{name}/modules %{_libdir}/%{name}/modules/libsss_autofs.so -%files tools -f sssd_tools.lang +%files tools %license COPYING %{_sbindir}/sss_obfuscate %{_sbindir}/sss_override @@ -815,7 +785,7 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con %{_libexecdir}/%{servicename}/sss_analyze %{python3_sitelib}/sssd/ -%files -n python3-sssdconfig -f python3_sssdconfig.lang +%files -n python3-sssdconfig %dir %{python3_sitelib}/SSSDConfig %{python3_sitelib}/SSSDConfig/*.py* %dir %{python3_sitelib}/SSSDConfig/__pycache__ @@ -866,14 +836,14 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con %files -n python3-libipa_hbac %{python3_sitearch}/pyhbac.so -%files winbind-idmap -f sssd_winbind_idmap.lang +%files winbind-idmap %dir %{_libdir}/samba/idmap %{_libdir}/samba/idmap/sss.so -%files nfs-idmap -f sssd_nfs_idmap.lang +%files nfs-idmap %{_libdir}/libnfsidmap/sss.so -%files -n libsss_certmap -f libsss_certmap.lang +%files -n libsss_certmap %license src/sss_client/COPYING src/sss_client/COPYING.LESSER %{_libdir}/libsss_certmap.so.* @@ -883,7 +853,7 @@ install -D -p -m 0644 contrib/sssd.sysusers %{buildroot}%{_sysusersdir}/sssd.con %{_libdir}/libsss_certmap.so %{_libdir}/pkgconfig/sss_certmap.pc -%files kcm -f sssd_kcm.lang +%files kcm %{_libexecdir}/%{servicename}/sssd_kcm %config(noreplace) %{_sysconfdir}/krb5.conf.d/kcm_default_ccache %dir %{_datadir}/sssd-kcm