From 2b9a1985d84af71521c5d1584091eef9dba596fd5529303a7be5300dba26927d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 11 Aug 2022 15:00:53 +0000 Subject: [PATCH] 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 --- python3-libmount.spec | 2 +- util-linux.changes | 5 +++++ util-linux.spec | 26 +++++++++++++------------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/python3-libmount.spec b/python3-libmount.spec index ad89f62..4b7281c 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -640,7 +640,7 @@ exit "$result" %install %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 %{SOURCE8} %{buildroot}%{_distconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_distconfdir}/pam.d/remote diff --git a/util-linux.changes b/util-linux.changes index 7a33e82..f428b75 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 9 07:51:17 UTC 2022 - Thorsten Kukuk + +- Use %_pam_vendordir + ------------------------------------------------------------------- Wed Jul 27 14:25:16 UTC 2022 - Ludwig Nussel diff --git a/util-linux.spec b/util-linux.spec index e1b3e21..d700f4a 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -640,14 +640,14 @@ exit "$result" %install %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 %{SOURCE8} %{buildroot}%{_distconfdir}/pam.d/login -install -m 644 %{SOURCE9} %{buildroot}%{_distconfdir}/pam.d/remote -install -m 644 %{SOURCE14} %{buildroot}%{_distconfdir}/pam.d/runuser -install -m 644 %{SOURCE15} %{buildroot}%{_distconfdir}/pam.d/runuser-l -install -m 644 %{SOURCE10} %{buildroot}%{_distconfdir}/pam.d/su -install -m 644 %{SOURCE16} %{buildroot}%{_distconfdir}/pam.d/su-l +install -m 644 %{SOURCE8} %{buildroot}%{_pam_vendordir}/login +install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote +install -m 644 %{SOURCE14} %{buildroot}%{_pam_vendordir}/runuser +install -m 644 %{SOURCE15} %{buildroot}%{_pam_vendordir}/runuser-l +install -m 644 %{SOURCE10} %{buildroot}%{_pam_vendordir}/su +install -m 644 %{SOURCE16} %{buildroot}%{_pam_vendordir}/su-l install -m 644 %{SOURCE11} %{buildroot}%{_distconfdir}/default/su sed 's/\bsu\b/runuser/g' <%{SOURCE11} >runuser.default 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}/blkid.conf %if %{defined no_config} -%{_distconfdir}/pam.d/login -%{_distconfdir}/pam.d/remote -%{_distconfdir}/pam.d/runuser -%{_distconfdir}/pam.d/runuser-l -%{_distconfdir}/pam.d/su -%{_distconfdir}/pam.d/su-l +%{_pam_vendordir}/login +%{_pam_vendordir}/remote +%{_pam_vendordir}/runuser +%{_pam_vendordir}/runuser-l +%{_pam_vendordir}/su +%{_pam_vendordir}/su-l %if 0%{?suse_version} <= 1520 %dir %{_distconfdir}/default %endif