1
0
forked from pool/util-linux

Accepting request 993955 from home:kukuk:branches:Base:System

- Use %_pam_vendordir

OBS-URL: https://build.opensuse.org/request/show/993955
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=470
This commit is contained in:
Jan Engelhardt 2022-08-11 15:00:53 +00:00 committed by Git OBS Bridge
parent 7018b627f0
commit 2b9a1985d8
3 changed files with 19 additions and 14 deletions

View File

@ -640,7 +640,7 @@ exit "$result"
%install %install
%if %build_util_linux %if %build_util_linux
mkdir -p %{buildroot}{%{_distconfdir}/{pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir},%{_sysconfdir}/issue.d} mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir},%{_sysconfdir}/issue.d}
install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf
install -m 644 %{SOURCE8} %{buildroot}%{_distconfdir}/pam.d/login install -m 644 %{SOURCE8} %{buildroot}%{_distconfdir}/pam.d/login
install -m 644 %{SOURCE9} %{buildroot}%{_distconfdir}/pam.d/remote install -m 644 %{SOURCE9} %{buildroot}%{_distconfdir}/pam.d/remote

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 9 07:51:17 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
- Use %_pam_vendordir
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 27 14:25:16 UTC 2022 - Ludwig Nussel <lnussel@suse.de> Wed Jul 27 14:25:16 UTC 2022 - Ludwig Nussel <lnussel@suse.de>

View File

@ -640,14 +640,14 @@ exit "$result"
%install %install
%if %build_util_linux %if %build_util_linux
mkdir -p %{buildroot}{%{_distconfdir}/{pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir},%{_sysconfdir}/issue.d} mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir},%{_sysconfdir}/issue.d}
install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf
install -m 644 %{SOURCE8} %{buildroot}%{_distconfdir}/pam.d/login install -m 644 %{SOURCE8} %{buildroot}%{_pam_vendordir}/login
install -m 644 %{SOURCE9} %{buildroot}%{_distconfdir}/pam.d/remote install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote
install -m 644 %{SOURCE14} %{buildroot}%{_distconfdir}/pam.d/runuser install -m 644 %{SOURCE14} %{buildroot}%{_pam_vendordir}/runuser
install -m 644 %{SOURCE15} %{buildroot}%{_distconfdir}/pam.d/runuser-l install -m 644 %{SOURCE15} %{buildroot}%{_pam_vendordir}/runuser-l
install -m 644 %{SOURCE10} %{buildroot}%{_distconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_pam_vendordir}/su
install -m 644 %{SOURCE16} %{buildroot}%{_distconfdir}/pam.d/su-l install -m 644 %{SOURCE16} %{buildroot}%{_pam_vendordir}/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_distconfdir}/default/su install -m 644 %{SOURCE11} %{buildroot}%{_distconfdir}/default/su
sed 's/\bsu\b/runuser/g' <%{SOURCE11} >runuser.default sed 's/\bsu\b/runuser/g' <%{SOURCE11} >runuser.default
install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser
@ -881,12 +881,12 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/filesystems
%config(noreplace) %{_sysconfdir}/blkid.conf %config(noreplace) %{_sysconfdir}/blkid.conf
%if %{defined no_config} %if %{defined no_config}
%{_distconfdir}/pam.d/login %{_pam_vendordir}/login
%{_distconfdir}/pam.d/remote %{_pam_vendordir}/remote
%{_distconfdir}/pam.d/runuser %{_pam_vendordir}/runuser
%{_distconfdir}/pam.d/runuser-l %{_pam_vendordir}/runuser-l
%{_distconfdir}/pam.d/su %{_pam_vendordir}/su
%{_distconfdir}/pam.d/su-l %{_pam_vendordir}/su-l
%if 0%{?suse_version} <= 1520 %if 0%{?suse_version} <= 1520
%dir %{_distconfdir}/default %dir %{_distconfdir}/default
%endif %endif