URL: https://github.com/SSSD/sssd/pull/191 Author: lslebodn Title: #191: Few spec file fixes Action: synchronized
To pull the PR as Git branch: git remote add ghsssd https://github.com/SSSD/sssd git fetch ghsssd pull/191/head:pr191 git checkout pr191
From 4c6abde3021ae62dab20139ad26bcbc2956d8fd6 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 10 Mar 2017 13:06:42 +0100 Subject: [PATCH 01/13] SPEC: Update processing of translation in %install --- contrib/sssd.spec.in | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 39a974e..d92de10 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -794,11 +794,10 @@ done %endif touch sssd.lang -touch sssd_tools.lang -touch sssd_client.lang -for provider in ldap krb5 ipa ad proxy +for subpackage in sssd_ldap sssd_krb5 sssd_ipa sssd_ad sssd_proxy sssd_tools \ + sssd_client do - touch sssd_$provider.lang + touch $subpackage.lang done for man in `find $RPM_BUILD_ROOT/%{_mandir}/??/man?/ -type f | sed -e "s#$RPM_BUILD_ROOT/%{_mandir}/##"` @@ -838,6 +837,25 @@ do esac done +# Print these to the rpmbuild log +echo "sssd.lang:" +cat sssd.lang + +echo "python2_sssdconfig.lang:" +cat python2_sssdconfig.lang + +%if (0%{?with_python3} == 1) +echo "python3_sssdconfig.lang:" +cat python3_sssdconfig.lang +%endif + +for subpackage in sssd_ldap sssd_krb5 sssd_ipa sssd_ad sssd_proxy sssd_tools \ + sssd_client +do + echo "$subpackage.lang:" + cat $subpackage.lang +done + %files %defattr(-,root,root,-) %doc COPYING From a441ecad10b97632b2b1e5e76a4a1c4054cb492f Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 10 Mar 2017 12:49:40 +0100 Subject: [PATCH 02/13] SPEC: Move systemd service sssd-ifp.service to right package Explanation Resolves: https://pagure.io/SSSD/sssd/issue/XXXX --- contrib/sssd.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index d92de10..515714d 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -869,7 +869,6 @@ done %{_unitdir}/sssd.service %{_unitdir}/sssd-autofs.socket %{_unitdir}/sssd-autofs.service -%{_unitdir}/sssd-ifp.service %{_unitdir}/sssd-nss.socket %{_unitdir}/sssd-nss.service %{_unitdir}/sssd-pac.socket @@ -1035,6 +1034,9 @@ done %doc COPYING %{_libexecdir}/%{servicename}/sssd_ifp %{_mandir}/man5/sssd-ifp.5* +%if (0%{?use_systemd} == 1) +%{_unitdir}/sssd-ifp.service +%endif # InfoPipe DBus plumbing %{_sysconfdir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf %{_datadir}/dbus-1/system-services/org.freedesktop.sssd.infopipe.service From 101c3a4eb441b8b620e67e13b4ee93deaf5bf957 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 10 Mar 2017 12:55:39 +0100 Subject: [PATCH 03/13] SPEC: Add missing scriptlets for package sssd-dbus --- contrib/sssd.spec.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 515714d..bb535ea 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -1291,6 +1291,15 @@ getent passwd sssd >/dev/null || useradd -r -g sssd -d / -s /sbin/nologin -c "Us %systemd_postun_with_restart sssd-sudo.socket %systemd_postun_with_restart sssd-sudo.service +%post dbus +%systemd_post sssd-ifp.service + +%preun dbus +%systemd_preun sssd-ifp.service + +%postun dbus +%systemd_postun_with_restart sssd-ifp.service + %else # sysv %post common From 5d35797b766a38c6e0cb182c369110c50be39a7b Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 10 Mar 2017 13:13:35 +0100 Subject: [PATCH 04/13] SPEC: Use correct package for translated sssd-ifp man page Resolves: https://pagure.io/SSSD/sssd/issue/3327 --- contrib/sssd.spec.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index bb535ea..8bf366f 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -795,7 +795,7 @@ done touch sssd.lang for subpackage in sssd_ldap sssd_krb5 sssd_ipa sssd_ad sssd_proxy sssd_tools \ - sssd_client + sssd_client sssd_dbus do touch $subpackage.lang done @@ -831,6 +831,9 @@ do sssd-proxy*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_proxy.lang ;; + sssd-ifp*) + echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_dbus.lang + ;; *) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd.lang ;; @@ -850,7 +853,7 @@ cat python3_sssdconfig.lang %endif for subpackage in sssd_ldap sssd_krb5 sssd_ipa sssd_ad sssd_proxy sssd_tools \ - sssd_client + sssd_client sssd_dbus do echo "$subpackage.lang:" cat $subpackage.lang @@ -1029,7 +1032,7 @@ done %attr(4750,root,sssd) %{_libexecdir}/%{servicename}/proxy_child %{_libdir}/%{name}/libsss_proxy.so -%files dbus +%files dbus -f sssd_dbus.lang %defattr(-,root,root,-) %doc COPYING %{_libexecdir}/%{servicename}/sssd_ifp From 3c7e9348f6a557020df15d26e9329a1428d3842d Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 10 Mar 2017 12:48:22 +0100 Subject: [PATCH 05/13] SPEC: Move man page for sss_rpcidmapd to the right package Patch also fixes location of translated manual pages Resolves: https://pagure.io/SSSD/sssd/issue/3327 --- contrib/sssd.spec.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 8bf366f..687a0b7 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -795,7 +795,7 @@ done touch sssd.lang for subpackage in sssd_ldap sssd_krb5 sssd_ipa sssd_ad sssd_proxy sssd_tools \ - sssd_client sssd_dbus + sssd_client sssd_dbus sssd_nfs_idmap do touch $subpackage.lang done @@ -807,6 +807,9 @@ do sss_cache*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd.lang ;; + sss_rpcidmapd*) + echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_nfs_idmap.lang + ;; sss_*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_tools.lang ;; @@ -853,7 +856,7 @@ cat python3_sssdconfig.lang %endif for subpackage in sssd_ldap sssd_krb5 sssd_ipa sssd_ad sssd_proxy sssd_tools \ - sssd_client sssd_dbus + sssd_client sssd_dbus sssd_nfs_idmap do echo "$subpackage.lang:" cat $subpackage.lang @@ -969,7 +972,6 @@ done %if (0%{?with_secrets} == 1) %{_mandir}/man5/sssd-secrets.5* %endif -%{_mandir}/man5/sss_rpcidmapd.5* %{_mandir}/man8/sssd.8* %{_mandir}/man8/sss_cache.8* %if (0%{?enable_systemtap} == 1) @@ -1223,7 +1225,8 @@ done %{_libdir}/samba/idmap/sss.so %{_mandir}/man8/idmap_sss.8* -%files nfs-idmap +%files nfs-idmap -f sssd_nfs_idmap.lang +%{_mandir}/man5/sss_rpcidmapd.5* %{_libdir}/libnfsidmap/sss.so %files -n libsss_certmap From dcc00102e11e1a2251448af98e83485ba9c3b6cb Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 10 Mar 2017 12:51:23 +0100 Subject: [PATCH 06/13] SPEC: Use correct package for translated sss_ssh* man pages Resolves: https://pagure.io/SSSD/sssd/issue/3327 --- contrib/sssd.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 687a0b7..1f5c8df 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -807,6 +807,9 @@ do sss_cache*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd.lang ;; + sss_ssh*) + echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd.lang + ;; sss_rpcidmapd*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_nfs_idmap.lang ;; From eb2c7dc96897e2994c42d871536ec2b6a8beeb95 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 10 Mar 2017 13:23:23 +0100 Subject: [PATCH 07/13] SPEC: Use correct package for translated sssctl man pages Resolves: https://pagure.io/SSSD/sssd/issue/3327 --- contrib/sssd.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 1f5c8df..23a861f 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -816,6 +816,9 @@ do sss_*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_tools.lang ;; + sssctl*) + echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_tools.lang + ;; sssd_krb5_*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_client.lang ;; From 6de4d07e1c35e7fce445834d3e866131e8b1f516 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 10 Mar 2017 13:30:43 +0100 Subject: [PATCH 08/13] SPEC: Use correct package for translated idmap_sss man pages Resolves: https://pagure.io/SSSD/sssd/issue/3327 --- contrib/sssd.spec.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 23a861f..5530258 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -795,7 +795,7 @@ 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_client sssd_dbus sssd_nfs_idmap sssd_winbind_idmap do touch $subpackage.lang done @@ -843,6 +843,9 @@ do sssd-ifp*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_dbus.lang ;; + idmap_sss*) + echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_winbind_idmap.lang + ;; *) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd.lang ;; @@ -862,7 +865,7 @@ cat python3_sssdconfig.lang %endif for subpackage in sssd_ldap sssd_krb5 sssd_ipa sssd_ad sssd_proxy sssd_tools \ - sssd_client sssd_dbus sssd_nfs_idmap + sssd_client sssd_dbus sssd_nfs_idmap sssd_winbind_idmap do echo "$subpackage.lang:" cat $subpackage.lang @@ -1226,7 +1229,7 @@ done %{_libdir}/%{name}/modules/libwbclient.so %{_libdir}/pkgconfig/wbclient_sssd.pc -%files winbind-idmap +%files winbind-idmap -f sssd_winbind_idmap.lang %dir %{_libdir}/samba/idmap %{_libdir}/samba/idmap/sss.so %{_mandir}/man8/idmap_sss.8* From 3629ae8a853053f24fa2ab6a8495c8fb524c3fe0 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 7 Apr 2017 14:48:14 +0200 Subject: [PATCH 09/13] SPEC: Use correct package for translated sss_certmap man pages This patch also moved sss_certmap.5 from sssd-common to libsss_certmap Resolves: https://pagure.io/SSSD/sssd/issue/3327 --- contrib/sssd.spec.in | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 5530258..1a945eb 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -795,7 +795,8 @@ 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 + sssd_client sssd_dbus sssd_nfs_idmap sssd_winbind_idmap \ + libsss_certmap do touch $subpackage.lang done @@ -846,6 +847,9 @@ do idmap_sss*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_winbind_idmap.lang ;; + sss-certmap*) + echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> libsss_certmap.lang + ;; *) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd.lang ;; @@ -865,7 +869,8 @@ cat python3_sssdconfig.lang %endif 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 + sssd_client sssd_dbus sssd_nfs_idmap sssd_winbind_idmap \ + libsss_certmap do echo "$subpackage.lang:" cat $subpackage.lang @@ -974,7 +979,6 @@ done %{_datadir}/sssd/sssd.api.d %{_mandir}/man1/sss_ssh_authorizedkeys.1* %{_mandir}/man1/sss_ssh_knownhostsproxy.1* -%{_mandir}/man5/sss-certmap.5* %{_mandir}/man5/sssd.conf.5* %{_mandir}/man5/sssd-simple.5* %{_mandir}/man5/sssd-sudo.5* @@ -1238,10 +1242,11 @@ done %{_mandir}/man5/sss_rpcidmapd.5* %{_libdir}/libnfsidmap/sss.so -%files -n libsss_certmap +%files -n libsss_certmap -f libsss_certmap.lang %defattr(-,root,root,-) %doc src/sss_client/COPYING src/sss_client/COPYING.LESSER %{_libdir}/libsss_certmap.so.* +%{_mandir}/man5/sss-certmap.5* %files -n libsss_certmap-devel %defattr(-,root,root,-) From 7f0442deccdf690cbb607e2f38eb11f1c08c0baf Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 7 Apr 2017 14:51:31 +0200 Subject: [PATCH 10/13] SPEC: Use correct package for translated sssd-kcm man pages Resolves: https://pagure.io/SSSD/sssd/issue/3327 --- contrib/sssd.spec.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 1a945eb..a91e561 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -796,7 +796,7 @@ 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 + libsss_certmap sssd_kcm do touch $subpackage.lang done @@ -844,6 +844,9 @@ do sssd-ifp*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_dbus.lang ;; + sssd-kcm*) + echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_kcm.lang + ;; idmap_sss*) echo \%lang\(${lang}\) \%{_mandir}/${man}\* >> sssd_winbind_idmap.lang ;; @@ -870,7 +873,7 @@ 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 + libsss_certmap sssd_kcm do echo "$subpackage.lang:" cat $subpackage.lang From e96fd8ceb5ffe2eb08a8d69d7e0af2669d5eb5e7 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 10 Mar 2017 13:34:37 +0100 Subject: [PATCH 11/13] SPEC: Move files provider files within package It is a cosmetic change to group similar files together (e.g. man pages). The same order is in fedora downstream spec file. It simplify comparison of changes between spec files. --- contrib/sssd.spec.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index a91e561..de89b65 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -925,6 +925,8 @@ done %endif %dir %{_libdir}/%{name} +# The files provider is intentionally packaged in -common +%{_libdir}/%{name}/libsss_files.so %{_libdir}/%{name}/libsss_simple.so #Internal shared libraries @@ -943,10 +945,6 @@ done %{_sbindir}/sss_cache %{_libexecdir}/%{servicename}/sss_signal -# The files provider is intentionally packaged in -common -%{_libdir}/%{name}/libsss_files.so -%{_mandir}/man5/sssd-files.5* - %dir %{sssdstatedir} %dir %{_localstatedir}/cache/krb5rcache %attr(700,sssd,sssd) %dir %{dbpath} @@ -983,6 +981,7 @@ done %{_mandir}/man1/sss_ssh_authorizedkeys.1* %{_mandir}/man1/sss_ssh_knownhostsproxy.1* %{_mandir}/man5/sssd.conf.5* +%{_mandir}/man5/sssd-files.5* %{_mandir}/man5/sssd-simple.5* %{_mandir}/man5/sssd-sudo.5* %if (0%{?with_secrets} == 1) From 64876dea1059547ee3699093db65dea0e6f42310 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 7 Apr 2017 15:00:01 +0200 Subject: [PATCH 12/13] SPEC: Move kcm scriptlets to systemd section --- contrib/sssd.spec.in | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index de89b65..f9230de 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -1322,6 +1322,18 @@ getent passwd sssd >/dev/null || useradd -r -g sssd -d / -s /sbin/nologin -c "Us %postun dbus %systemd_postun_with_restart sssd-ifp.service +%if (0%{?with_kcm} == 1) +%post kcm +%systemd_post sssd-kcm.socket + +%preun kcm +%systemd_preun sssd-kcm.socket + +%postun kcm +%systemd_postun_with_restart sssd-kcm.socket +%systemd_postun_with_restart sssd-kcm.service +%endif + %else # sysv %post common @@ -1372,18 +1384,6 @@ fi %postun -n libsss_simpleifp -p /sbin/ldconfig -%if (0%{?with_kcm} == 1) -%post kcm -%systemd_post sssd-kcm.socket - -%preun kcm -%systemd_preun sssd-kcm.socket - -%postun kcm -%systemd_postun_with_restart sssd-kcm.socket -%systemd_postun_with_restart sssd-kcm.service -%endif - %changelog * Mon Mar 15 2010 Stephen Gallagher <[email protected]> - @PACKAGE_VERSION@-0@PRERELEASE_VERSION@ - Automated build of the SSSD From 2cb1c4b414d8173b955c9c3bd57a21d7eaa736a6 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Fri, 7 Apr 2017 15:02:13 +0200 Subject: [PATCH 13/13] SPEC: Call ldconfig in libsss_certmap scriptlets We do it for other libraries. --- contrib/sssd.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index f9230de..e947998 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -1384,6 +1384,10 @@ fi %postun -n libsss_simpleifp -p /sbin/ldconfig +%post -n libsss_certmap -p /sbin/ldconfig + +%postun -n libsss_certmap -p /sbin/ldconfig + %changelog * Mon Mar 15 2010 Stephen Gallagher <[email protected]> - @PACKAGE_VERSION@-0@PRERELEASE_VERSION@ - Automated build of the SSSD
_______________________________________________ sssd-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
