From 35d04ec2d3ae0107ad633acc253ff3130ee30b63 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Mon, 30 Jul 2018 17:31:34 -0400
Subject: pcr/elogind: Don't conflict with systemd-dummy

---
 pcr/elogind/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pcr/elogind/PKGBUILD b/pcr/elogind/PKGBUILD
index f300c6447..4b399cfa3 100644
--- a/pcr/elogind/PKGBUILD
+++ b/pcr/elogind/PKGBUILD
@@ -11,7 +11,7 @@ pkgbase=elogind
 pkgname=('elogind' 'libelogind' 'libelogind-manpages')
 pkgver=238.1.0
 _commit='8bb4695ef79404b6731b20dee58115c313444754'
-pkgrel=1
+pkgrel=2
 pkgdesc="The systemd project's logind, extracted to a standalone package"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/elogind/elogind"
@@ -72,7 +72,7 @@ build() {
 
 package_elogind() {
   depends=('acl' 'pam' 'dbus' 'udev' 'libelogind')
-  conflicts=('systemd') # because both provide org.freedesktop.login1
+  conflicts=('systemd-tools') # because both provide org.freedesktop.login1, say 'systemd-tools' instead of 'systemd' to avoid hitting systemd-dummy
   optdepends=('elogind-openrc: elogind initscript'
               'polkit-elogind: polkit support')
   backup=('etc/elogind/logind.conf')
-- 
cgit v1.2.3