From f24d8c7499a77d733cfaaca72b5e50de7509e7a3c768f8fa93468b3ffec3afdb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 20 Aug 2022 08:49:22 +0000 Subject: [PATCH] Accepting request 994141 from home:kukuk:branches:X11:XOrg - Use %_pam_vendordir OBS-URL: https://build.opensuse.org/request/show/994141 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=250 --- xdm.changes | 5 +++++ xdm.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xdm.changes b/xdm.changes index fbe97f0..c49da48 100644 --- a/xdm.changes +++ b/xdm.changes @@ -3,6 +3,11 @@ Fri Aug 19 09:42:56 UTC 2022 - Dirk Müller - add buildrequires for bsd/stdlib.h (bsc#1202222) +------------------------------------------------------------------- +Tue Aug 9 12:34:33 UTC 2022 - Thorsten Kukuk + +- Use %_pam_vendordir + ------------------------------------------------------------------- Thu Jun 30 12:18:41 UTC 2022 - Stefan Schubert diff --git a/xdm.spec b/xdm.spec index 401c4a9..64f4f6d 100644 --- a/xdm.spec +++ b/xdm.spec @@ -132,7 +132,8 @@ mv etc/X11/xdm/* usr%{_sysconfdir}/X11/xdm for i in xdm-config Xservers; do cp usr%{_sysconfdir}/X11/xdm/$i etc/X11/xdm/$i done -mv etc/pam.d usr%{_sysconfdir}/ +mkdir -p ./%{_pam_vendordir} +mv etc/pam.d/* ./%{_pam_vendordir}/ %else patch -p0 < %{PATCH4} %endif @@ -251,8 +252,8 @@ sed -i 's/DISPLAYMANAGER=.*//g' %{_sysconfdir}/sysconfig/displaymanager %config %{_sysconfdir}/logrotate.d/xdm %endif %if 0%{?UsrEtcMove} -%{_distconfdir}/pam.d/xdm -%{_distconfdir}/pam.d/xdm-np +%{_pam_vendordir}/xdm +%{_pam_vendordir}/xdm-np %else %config(noreplace) %{_sysconfdir}/pam.d/xdm %config(noreplace) %{_sysconfdir}/pam.d/xdm-np