From 99fd8d508efeeb609dfb684969791e72d1bac829965d9570659ce67095326158 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Fri, 17 Jun 2022 15:30:56 +0000
Subject: [PATCH] Accepting request 983463 from home:kukuk:tiu

- Keep old directory in filelist for migration

OBS-URL: https://build.opensuse.org/request/show/983463
OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=263
---
 macros.pam  | 2 +-
 pam.changes | 5 +++++
 pam.spec    | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/macros.pam b/macros.pam
index 90a9763..87a5493 100644
--- a/macros.pam
+++ b/macros.pam
@@ -2,6 +2,6 @@
 %_pam_moduledir  %{_libdir}/security
 %_pam_secconfdir %{_sysconfdir}/security
 %_pam_confdir    %{_sysconfdir}/pam.d
-%_pam_vendordir  %{_usr}/lib/pam.d
+%_pam_vendordir  %{_prefix}/lib/pam.d
 # legacy, to be retired
 %_pamdir         %{_pam_moduledir}
diff --git a/pam.changes b/pam.changes
index b3ffb4d..210835b 100644
--- a/pam.changes
+++ b/pam.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 17 15:26:20 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
+
+- Keep old directory in filelist for migration
+
 -------------------------------------------------------------------
 Wed Jun  1 11:43:22 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/pam.spec b/pam.spec
index 8563489..fc8bf01 100644
--- a/pam.spec
+++ b/pam.spec
@@ -215,6 +215,8 @@ mkdir -p %{buildroot}%{_includedir}/security
 mkdir -p %{buildroot}%{_pam_moduledir}
 mkdir -p %{buildroot}/sbin
 mkdir -p -m 755 %{buildroot}%{_libdir}
+# For compat reasons
+mkdir -p %{buildroot}%{_distconfdir}/pam.d
 %make_install
 /sbin/ldconfig -n %{buildroot}%{libdir}
 # Install documentation
@@ -314,6 +316,8 @@ done
 %dir %{_pam_secconfdir}
 %dir %{_pam_secconfdir}/limits.d
 %dir %{_distconfdir}/security
+# /usr/etc/pam.d is for compat reasons
+%dir %{_distconfdir}/pam.d
 %dir %{_prefix}/lib/motd.d
 %if %{defined config_noreplace}
 %config(noreplace) %{_pam_confdir}/other