SHA256
1
0
forked from pool/fwupd

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
This commit is contained in:
Dominique Leuenberger 2019-05-08 09:49:54 +00:00 committed by Git OBS Bridge
parent 0cb28681d1
commit 819862ddcb
2 changed files with 10 additions and 2 deletions

View File

@ -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> Thu Mar 28 07:31:49 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>

View File

@ -93,10 +93,10 @@ BuildRequires: pkgconfig(efivar) >= 33
BuildRequires: pkgconfig(libsmbios_c) >= 2.3.0 BuildRequires: pkgconfig(libsmbios_c) >= 2.3.0
%endif %endif
%if %{with efi_fw_update} %if %{with efi_fw_update}
Obsoletes: fwupdate
%ifarch x86_64 %ifarch x86_64
Requires: shim >= 11 Requires: shim >= 11
%endif %endif
Obsoletes: fwupdate
%endif %endif
%description %description
@ -178,6 +178,9 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcfwupd-offline-update ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcfwupd-offline-update
%find_lang %{name} %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 # do not package tests
rm -fr %{buildroot}%{_datadir}/installed-tests rm -fr %{buildroot}%{_datadir}/installed-tests
@ -235,7 +238,6 @@ fi
%{_datadir}/%{name}/ %{_datadir}/%{name}/
%{_mandir}/man1/fwupdmgr.1%{?ext_man} %{_mandir}/man1/fwupdmgr.1%{?ext_man}
%{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy %{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
%{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
%config %{_sysconfdir}/%{name}/ %config %{_sysconfdir}/%{name}/
%dir %{_sysconfdir}/pki %dir %{_sysconfdir}/pki
%dir %{_sysconfdir}/pki/fwupd %dir %{_sysconfdir}/pki/fwupd