From 4e6f6da3cb10bd569a909dd2e0f68747a2a5f97d7d1c73c78aed92019ea86f2b Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 15 Mar 2021 12:53:01 +0000
Subject: [PATCH] Accepting request 878406 from home:kukuk:branches:Base:System

- Move /etc/dbus-1/system.d to /usr/share/dbus-1/system.d, the
  first location is only for admin changes
- Move pam configuration to /usr/etc/pam.d

OBS-URL: https://build.opensuse.org/request/show/878406
OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit?expand=0&rev=148
---
 polkit.changes |  7 +++++++
 polkit.spec    | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/polkit.changes b/polkit.changes
index 4eaaa06..30cb3bb 100644
--- a/polkit.changes
+++ b/polkit.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 11 22:21:07 UTC 2021 - Thorsten Kukuk <kukuk@suse.com>
+
+- Move /etc/dbus-1/system.d to /usr/share/dbus-1/system.d, the
+  first location is only for admin changes
+- Move pam configuration to /usr/etc/pam.d
+
 -------------------------------------------------------------------
 Mon Jan  4 09:51:04 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
 
diff --git a/polkit.spec b/polkit.spec
index 6aee6e8..9a0555d 100644
--- a/polkit.spec
+++ b/polkit.spec
@@ -145,6 +145,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 # create $HOME for polkit user
 install -d %{buildroot}%{_localstatedir}/lib/polkit
 %find_lang polkit-1
+mkdir -p %{buildroot}%{_datadir}/dbus-1/system.d
+mv %{buildroot}%{_sysconfdir}/dbus-1/system.d/* %{buildroot}%{_datadir}/dbus-1/system.d/
+mkdir -p %{buildroot}%{_distconfdir}/pam.d
+mv %{buildroot}%{_sysconfdir}/pam.d/* %{buildroot}%{_distconfdir}/pam.d/
 
 %pre
 getent group polkitd > /dev/null || groupadd -r polkitd
@@ -190,14 +194,13 @@ exit 0
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/system-services
 %{_datadir}/dbus-1/system-services/org.freedesktop.PolicyKit1.service
+%dir %{_datadir}/dbus-1/system.d
+%{_datadir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
 %dir %{_datadir}/polkit-1
 %dir %{_datadir}/polkit-1/actions
 %{_datadir}/polkit-1/actions/org.freedesktop.policykit.policy
 %attr(0700,polkitd,root) %dir %{_datadir}/polkit-1/rules.d
-%dir %{_sysconfdir}/dbus-1
-%dir %{_sysconfdir}/dbus-1/system.d
-%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
-%config %{_sysconfdir}/pam.d/polkit-1
+%{_distconfdir}/pam.d/polkit-1
 %dir %{_sysconfdir}/polkit-1
 %attr(0700,polkitd,root) %dir %{_sysconfdir}/polkit-1/rules.d
 %config %{_sysconfdir}/polkit-1/rules.d/50-default.rules