From f8d6ec4fd6c84501558310b904d432bdca8229e471f7f9eb5d3c490600488ea4 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Wed, 23 Nov 2022 12:21:53 +0000
Subject: [PATCH] Accepting request 1037574 from home:kukuk:tiu

- Move pam_env config files below /usr/etc

OBS-URL: https://build.opensuse.org/request/show/1037574
OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=266
---
 pam.changes | 5 +++++
 pam.spec    | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pam.changes b/pam.changes
index d39faf6..db5f842 100644
--- a/pam.changes
+++ b/pam.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 22 15:24:12 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
+
+- Move pam_env config files below /usr/etc
+
 -------------------------------------------------------------------
 Tue Oct 11 14:44:56 UTC 2022 - Stefan Schubert <schubi@suse.com>
 
diff --git a/pam.spec b/pam.spec
index 070c148..a09aebc 100644
--- a/pam.spec
+++ b/pam.spec
@@ -260,7 +260,8 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.pam
 install -Dm0644 %{SOURCE13} %{buildroot}%{_tmpfilesdir}/pam.conf
 
 mkdir -p %{buildroot}%{_distconfdir}/security
-mv %{buildroot}%{_sysconfdir}/security/{limits.conf,faillock.conf,group.conf} %{buildroot}%{_distconfdir}/security/
+mv %{buildroot}%{_sysconfdir}/security/{limits.conf,faillock.conf,group.conf,pam_env.conf} %{buildroot}%{_distconfdir}/security/
+mv %{buildroot}%{_sysconfdir}/environment %{buildroot}%{_distconfdir}/environment
 
 # Remove manual pages for main package
 %if !%{build_doc}
@@ -330,12 +331,12 @@ done
 %{_pam_vendordir}/other
 %{_pam_vendordir}/common-*
 %endif
-%config(noreplace) %{_sysconfdir}/environment
+%{_distconfdir}/environment
 %config(noreplace) %{_pam_secconfdir}/access.conf
 %{_distconfdir}/security/group.conf
 %{_distconfdir}/security/faillock.conf
 %{_distconfdir}/security/limits.conf
-%config(noreplace) %{_pam_secconfdir}/pam_env.conf
+%{_distconfdir}/security/pam_env.conf
 %if %{enable_selinux}
 %config(noreplace) %{_pam_secconfdir}/sepermit.conf
 %endif