From 819862ddcb16e9702081308547edb26637c9601ddd8b354fc0771776544df055 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 8 May 2019 09:49:54 +0000
Subject: [PATCH] Accepting request 700436 from home:dimstar:Factory

- Stop shipping polkit rules, as we have the distro specific setup
  in polkit-default-privs (boo#1125428).

OBS-URL: https://build.opensuse.org/request/show/700436
OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=49
---
 fwupd.changes | 6 ++++++
 fwupd.spec    | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fwupd.changes b/fwupd.changes
index ce0be7e..9e63209 100644
--- a/fwupd.changes
+++ b/fwupd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May  3 15:53:17 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Stop shipping polkit rules, as we have the distro specific setup
+  in polkit-default-privs (boo#1125428).
+
 -------------------------------------------------------------------
 Thu Mar 28 07:31:49 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>
 
diff --git a/fwupd.spec b/fwupd.spec
index 59f7fa3..babf92c 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -93,10 +93,10 @@ BuildRequires:  pkgconfig(efivar) >= 33
 BuildRequires:  pkgconfig(libsmbios_c) >= 2.3.0
 %endif
 %if %{with efi_fw_update}
+Obsoletes:      fwupdate
 %ifarch x86_64
 Requires:       shim >= 11
 %endif
-Obsoletes:      fwupdate
 %endif
 
 %description
@@ -178,6 +178,9 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcfwupd-offline-update
 %find_lang %{name}
 
+# Do not ship default polkit .rules - openSUSE overrides them anyway - boo#1125428
+rm %{buildroot}%{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
+
 # do not package tests
 rm -fr %{buildroot}%{_datadir}/installed-tests
 
@@ -235,7 +238,6 @@ fi
 %{_datadir}/%{name}/
 %{_mandir}/man1/fwupdmgr.1%{?ext_man}
 %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
-%{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
 %config %{_sysconfdir}/%{name}/
 %dir %{_sysconfdir}/pki
 %dir %{_sysconfdir}/pki/fwupd