From 2809df176d9ed025d554b9780a3c8c43cd4ac54b Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mar 02 2017 18:37:46 +0000 Subject: Fix installation conflict with polkit Error: Transaction check error: file /usr/share/polkit-1/rules.d from install of systemd-233-1.fc27.x86_64 conflicts with file from package polkit-0.113-7.fc26.x86_64 --- diff --git a/systemd.spec b/systemd.spec index 8a81425..c5f86aa 100644 --- a/systemd.spec +++ b/systemd.spec @@ -13,7 +13,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 233 -Release: 1%{?gitcommit:.git%{gitcommitshort}}%{?dist} +Release: 2%{?gitcommit:.git%{gitcommitshort}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -847,7 +847,6 @@ getent passwd systemd-journal-upload &>/dev/null || useradd -r -l -g systemd-jou %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions -%dir %{_datadir}/polkit-1/rules.d %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy @@ -1038,6 +1037,9 @@ getent passwd systemd-journal-upload &>/dev/null || useradd -r -l -g systemd-jou %{pkgdir}/tests %changelog +* Thu Mar 2 2017 Zbigniew Jędrzejewski-Szmek - 233-2 +- Fix installation conflict with polkit + * Thu Mar 2 2017 Zbigniew Jędrzejewski-Szmek - 233-1 - New upstream release (#1416201, #1405439, #1420753, many others) - New systemd-tests subpackage with "installed tests"