Accepting request 993701 from home:kukuk:branches:network

- Use %_pam_vendordir

OBS-URL: https://build.opensuse.org/request/show/993701
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=241
This commit is contained in:
Marcus Meissner 2022-08-29 08:24:07 +00:00 committed by Git OBS Bridge
parent 88b8e8e7aa
commit cb5c9c99b3
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 8 07:36:55 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
- Use %_pam_vendordir
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 6 12:15:29 UTC 2022 - Adam Majer <adam.majer@suse.de> Wed Jul 6 12:15:29 UTC 2022 - Adam Majer <adam.majer@suse.de>

View File

@ -311,8 +311,8 @@ export LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
%install %install
%make_install %make_install
%if %{defined _distconfdir} %if %{defined _distconfdir}
install -d -m 755 %{buildroot}%{_distconfdir}/pam.d install -d -m 755 %{buildroot}%{_pam_vendordir}
install -m 644 %{SOURCE2} %{buildroot}%{_distconfdir}/pam.d/sshd install -m 644 %{SOURCE2} %{buildroot}%{_pam_vendordir}/sshd
%else %else
install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/sshd install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/sshd
@ -447,7 +447,7 @@ test -f /etc/ssh/ssh_config.rpmsave && mv -v /etc/ssh/ssh_config.rpmsave /etc/ss
%attr(0755,root,root) %dir /usr/etc/ssh/sshd_config.d %attr(0755,root,root) %dir /usr/etc/ssh/sshd_config.d
%attr(0640,root,root) %{_distconfdir}/ssh/sshd_config %attr(0640,root,root) %{_distconfdir}/ssh/sshd_config
%if %{defined _distconfdir} %if %{defined _distconfdir}
%attr(0644,root,root) %{_distconfdir}/pam.d/sshd %attr(0644,root,root) %{_pam_vendordir}/sshd
%else %else
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/sshd %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/sshd
%endif %endif