Accepting request 147754 from home:saschpe:branches:Base:System

- Only mark the following files as %config, not %config(noreplace):
  + %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
  + %{_sysconfdir}/pam.d/polkit-1
  + %{_sysconfdir}/polkit-1/rules.d/50-default.rules
  PolicyKit's own config files should only be changed for good reason
  and we want to prefer openSUSE's defaults (you still get an .rpmsafe
  file)

OBS-URL: https://build.opensuse.org/request/show/147754
OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit?expand=0&rev=83
This commit is contained in:
Vincent Untz 2013-01-09 14:30:23 +00:00 committed by Git OBS Bridge
parent d88aee042b
commit 9b195e111a
2 changed files with 15 additions and 4 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jan 9 14:08:57 UTC 2013 - saschpe@suse.de
- Only mark the following files as %config, not %config(noreplace):
+ %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
+ %{_sysconfdir}/pam.d/polkit-1
+ %{_sysconfdir}/polkit-1/rules.d/50-default.rules
PolicyKit's own config files should only be changed for good reason
and we want to prefer openSUSE's defaults (you still get an .rpmsafe
file)
-------------------------------------------------------------------
Mon Dec 10 07:45:47 UTC 2012 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package polkit
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -223,11 +223,11 @@ exit 0
%attr(0700,polkitd,root) %dir %{_datadir}/polkit-1/rules.d
%dir %{_sysconfdir}/dbus-1
%dir %{_sysconfdir}/dbus-1/system.d
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
%config(noreplace) %{_sysconfdir}/pam.d/polkit-1
%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
%config %{_sysconfdir}/pam.d/polkit-1
%dir %{_sysconfdir}/polkit-1
%attr(0700,polkitd,root) %dir %{_sysconfdir}/polkit-1/rules.d
%config(noreplace) %{_sysconfdir}/polkit-1/rules.d/50-default.rules
%config %{_sysconfdir}/polkit-1/rules.d/50-default.rules
%{_bindir}/pkaction
%{_bindir}/pkcheck
%verify(not mode) %attr(4755,root,root) %{_bindir}/pkexec