From 0ca771d496be2495637c9cf814c0f81eb70c77117e91050f169f831d00eb3a71 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Tue, 9 Aug 2022 09:45:37 +0000
Subject: [PATCH] Accepting request 993912 from home:kukuk:branches:Base:System

- Remove duplicate pam.d/useradd entry
- Provide /etc/login.defs.d on SLE15 since we support and use it
- Use %_pam_vendordir macro

OBS-URL: https://build.opensuse.org/request/show/993912
OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=121
---
 shadow.changes | 11 +++++++++++
 shadow.spec    | 33 +++++++++++++++++----------------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/shadow.changes b/shadow.changes
index 1887d68..0129bfc 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Aug  9 06:29:07 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
+
+- Remove duplicate pam.d/useradd entry
+- Provide /etc/login.defs.d on SLE15 since we support and use it
+
+-------------------------------------------------------------------
+Mon Aug  8 13:00:46 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
+
+- Use %_pam_vendordir macro
+
 -------------------------------------------------------------------
 Wed Jan 12 16:52:39 UTC 2022 - Stanislav Brabec <sbrabec@suse.com>
 
diff --git a/shadow.spec b/shadow.spec
index 9c4024e..29c86c9 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -231,9 +231,11 @@ rm %{buildroot}/%{_libdir}/libsubid.{la,a}
 # Move /etc to /usr/etc
 if [ ! -d %{buildroot}%{_distconfdir} ]; then
     mkdir -p %{buildroot}%{_distconfdir}
-    mv %{buildroot}%{_sysconfdir}/{login.defs,pam.d} %{buildroot}%{_distconfdir}
-    mkdir -p %{buildroot}%{_sysconfdir}/login.defs.d
+    mkdir -p %{buildroot}%{_pam_vendordir}
+    mv %{buildroot}%{_sysconfdir}/login.defs %{buildroot}%{_distconfdir}
+    mv %{buildroot}%{_sysconfdir}/pam.d/* %{buildroot}%{_pam_vendordir}/
 fi
+mkdir -p %{buildroot}%{_sysconfdir}/login.defs.d
 
 %find_lang shadow
 
@@ -299,19 +301,18 @@ test -f %{_sysconfdir}/login.defs.rpmsave && mv -v %{_sysconfdir}/login.defs.rpm
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/subuid
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/subgid
 %if %{defined no_config}
-%{_distconfdir}/pam.d/chage
-%{_distconfdir}/pam.d/chfn
-%{_distconfdir}/pam.d/chsh
-%{_distconfdir}/pam.d/passwd
-%{_distconfdir}/pam.d/useradd
-%{_distconfdir}/pam.d/chpasswd
-%{_distconfdir}/pam.d/groupadd
-%{_distconfdir}/pam.d/groupdel
-%{_distconfdir}/pam.d/groupmod
-%{_distconfdir}/pam.d/newusers
-%{_distconfdir}/pam.d/useradd
-%{_distconfdir}/pam.d/userdel
-%{_distconfdir}/pam.d/usermod
+%{_pam_vendordir}/chage
+%{_pam_vendordir}/chfn
+%{_pam_vendordir}/chsh
+%{_pam_vendordir}/passwd
+%{_pam_vendordir}/chpasswd
+%{_pam_vendordir}/groupadd
+%{_pam_vendordir}/groupdel
+%{_pam_vendordir}/groupmod
+%{_pam_vendordir}/newusers
+%{_pam_vendordir}/useradd
+%{_pam_vendordir}/userdel
+%{_pam_vendordir}/usermod
 %else
 %config %{_sysconfdir}/pam.d/chage
 %config %{_sysconfdir}/pam.d/chfn
@@ -389,8 +390,8 @@ test -f %{_sysconfdir}/login.defs.rpmsave && mv -v %{_sysconfdir}/login.defs.rpm
 %{_unitdir}/*
 
 %files -n login_defs
-%if %{defined no_config}
 %dir %{_sysconfdir}/login.defs.d
+%if %{defined no_config}
 %attr(0644,root,root) %{_distconfdir}/login.defs
 %else
 %attr(0644,root,root) %config %{_sysconfdir}/login.defs