Accepting request 832794 from home:dimstar:Factory

- Install pam configuration to /usr/etc/pam.d on suse_version >=
  1500 (https://en.opensuse.org/openSUSE:Packaging_UsrEtc#pam.2Fpam-config).
- Add pre/posttrans scripts to ensure user modified
  /etc/pam.d/i3lock survives our move to /usr/etc (and user
  modification in /etc/pam.d wins over /usr/etc/pam.d)

OBS-URL: https://build.opensuse.org/request/show/832794
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/i3lock?expand=0&rev=38

i3lock.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Sep  7 13:25:22 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Install pam configuration to /usr/etc/pam.d on suse_version >=
+  1500 (https://en.opensuse.org/openSUSE:Packaging_UsrEtc#pam.2Fpam-config).
+- Add pre/posttrans scripts to ensure user modified
+  /etc/pam.d/i3lock survives our move to /usr/etc (and user
+  modification in /etc/pam.d wins over /usr/etc/pam.d)
+
 -------------------------------------------------------------------
 Sat Jun  6 11:57:02 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
 

i3lock.spec

@@ -74,6 +74,21 @@ export CFLAGS="%{optflags}"
 install -D -m0644 %{name}.1 "%{buildroot}%{_mandir}/man1/%{name}.1"
 install -D -m0644 %{SOURCE2} %{buildroot}%{_datadir}/i3lock-xlock-compat/i3lock-icon.png
 install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock
+%if 0%{?suse_version} >= 1550
+mkdir -p %{buildroot}%{_distconfdir}
+mv %{buildroot}%{_sysconfdir}/pam.d %{buildroot}%{_distconfdir}
+%endif
+
+%pre
+for i in pam.d/i3lock ; do
+  test -f /etc/${i}.rpmsave && mv -v /etc/${i}.rpmsave /etc/${i}.rpmsave.old ||:
+done
+
+%posttrans
+# Migration to /usr/etc.
+for i in pam.d/i3lock ; do
+  test -f /etc/${i}.rpmsave && mv -v /etc/${i}.rpmsave /etc/${i} ||:
+done
 
 %files xlock-compat
 %{_bindir}/xlock
@@ -82,7 +97,11 @@ install -m0755 %{SOURCE3} %{buildroot}/%{_bindir}/xlock
 %files
 %license LICENSE
 %doc CHANGELOG README.md
+%if 0%{?suse_version} >= 1550
+%{_distconfdir}/pam.d/%{name}
+%else
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%endif
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1%{?ext_man}