From 8bb49c98641f4dc0855ce40e00ab583472a95b71a0205518d426a89d8d14a9a8 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Fri, 16 Dec 2022 19:38:45 +0000
Subject: [PATCH 1/2] Accepting request 1043357 from home:schubi2:pam_usr_etc

- Migration PAM settings to /usr/etc: Saving user changed
  configuration files in /etc and restoring them while an RPM
  update.

OBS-URL: https://build.opensuse.org/request/show/1043357
OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=99
---
 screen.changes |  7 +++++++
 screen.spec    | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/screen.changes b/screen.changes
index 4e8e80d..8a2299e 100644
--- a/screen.changes
+++ b/screen.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 12 14:28:14 UTC 2022 - Stefan Schubert <schubi@suse.com>
+
+- Migration PAM settings to /usr/etc: Saving user changed
+  configuration files in /etc and restoring them while an RPM
+  update.  
+
 -------------------------------------------------------------------
 Sat Feb 26 11:08:20 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/screen.spec b/screen.spec
index 5950329..d5cafe7 100644
--- a/screen.spec
+++ b/screen.spec
@@ -88,7 +88,11 @@ rm -f %{buildroot}%{_bindir}/screen
 mv %{buildroot}%{_bindir}/screen-%{version} %{buildroot}%{_bindir}/screen
 chmod 755 %{buildroot}%{_bindir}/screen
 mkdir -p %{buildroot}%{_sysconfdir}
+%if 0%{?suse_version} > 1500
+mkdir -p %{buildroot}%{_distconfdir}/pam.d
+%else
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
+%endif
 mkdir -p %{buildroot}%{_prefix}/lib
 mkdir -p %{buildroot}%{_tmpfilesdir}
 mkdir -p %{buildroot}%{rundir}/screens
@@ -96,11 +100,19 @@ chmod 755 %{buildroot}%{rundir}/screens
 mkdir -p %{buildroot}%{rundir}/uscreens
 install -m 644 screenrc %{buildroot}%{_sysconfdir}/screenrc
 install -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}
+%if 0%{?suse_version} > 1500
+install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/screen
+%else
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/screen
+%endif
 
 %files
 %config %{_sysconfdir}/screenrc
+%if 0%{?suse_version} > 1500
+%{_distconfdir}/pam.d/screen
+%else
 %config %{_sysconfdir}/pam.d/screen
+%endif
 %attr(555,root,root) %{_bindir}/screen
 %dir %{_datadir}/screen
 %{_tmpfilesdir}/screen.conf
@@ -109,6 +121,20 @@ install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/screen
 %{_mandir}/man1/screen.1%{?ext_man}
 %license COPYING
 
+%if 0%{?suse_version} > 1500
+%pre
+# Prepare for migration to /usr/etc; save any old .rpmsave
+for i in pam.d/screen ; do
+     test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
+done
+
+%posttrans
+# Migration to /usr/etc, restore just created .rpmsave
+for i in pam.d/screen ; do
+     test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
+done
+%endif
+
 %post
 %tmpfiles_create %{_tmpfilesdir}/screen.conf
 

From 309d5e4c81c3e6e9e91c85f568bd4325488695513241b1ece34946fee3f3c01f Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Mon, 19 Dec 2022 12:18:58 +0000
Subject: [PATCH 2/2] Accepting request 1043410 from home:gmbr3:Active

- Use %_pam_vendordir

OBS-URL: https://build.opensuse.org/request/show/1043410
OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=100
---
 screen.changes | 5 +++++
 screen.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/screen.changes b/screen.changes
index 8a2299e..5293ce8 100644
--- a/screen.changes
+++ b/screen.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec 16 22:18:05 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Use %_pam_vendordir
+
 -------------------------------------------------------------------
 Mon Dec 12 14:28:14 UTC 2022 - Stefan Schubert <schubi@suse.com>
 
diff --git a/screen.spec b/screen.spec
index d5cafe7..fc86916 100644
--- a/screen.spec
+++ b/screen.spec
@@ -89,7 +89,7 @@ mv %{buildroot}%{_bindir}/screen-%{version} %{buildroot}%{_bindir}/screen
 chmod 755 %{buildroot}%{_bindir}/screen
 mkdir -p %{buildroot}%{_sysconfdir}
 %if 0%{?suse_version} > 1500
-mkdir -p %{buildroot}%{_distconfdir}/pam.d
+mkdir -p %{buildroot}%{_pam_vendordir}
 %else
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
 %endif
@@ -101,7 +101,7 @@ mkdir -p %{buildroot}%{rundir}/uscreens
 install -m 644 screenrc %{buildroot}%{_sysconfdir}/screenrc
 install -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}
 %if 0%{?suse_version} > 1500
-install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/screen
+install -m 644 %{SOURCE4} %{buildroot}%{_pam_vendordir}/screen
 %else
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/screen
 %endif
@@ -109,7 +109,7 @@ install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/screen
 %files
 %config %{_sysconfdir}/screenrc
 %if 0%{?suse_version} > 1500
-%{_distconfdir}/pam.d/screen
+%{_pam_vendordir}/screen
 %else
 %config %{_sysconfdir}/pam.d/screen
 %endif