From f6c497c819e5107bb98d1e51f688a712ff4a5a1052cb25bd95e1af6ee9f51cef Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 8 Jun 2016 11:19:35 +0000
Subject: [PATCH] Accepting request 400659 from home:fbui:branches:Base:System

- Use pkgconfig() instead of requiring systemd package names directly.

- systemd.pc is shipped by systemd main package (bsc#983167)

OBS-URL: https://build.opensuse.org/request/show/400659
OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit?expand=0&rev=111
---
 polkit.changes | 12 ++++++++++++
 polkit.spec    | 11 +++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/polkit.changes b/polkit.changes
index 8c37a90..fd57194 100644
--- a/polkit.changes
+++ b/polkit.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jun  8 11:13:43 UTC 2016 - fbui@suse.com
+
+- Use pkgconfig() instead of requiring systemd package names directly.
+
+-------------------------------------------------------------------
+Tue Jun  7 15:25:00 UTC 2016 - fbui@suse.com
+
+- systemd.pc is shipped by systemd main package (bsc#983167)
+  Strangely polkit wants systemd.pc to detect that the target system
+  is running systemd even if its configured to build systemd support...
+
 -------------------------------------------------------------------
 Thu Nov 26 16:26:09 UTC 2015 - meissner@suse.com
 
diff --git a/polkit.spec b/polkit.spec
index 7ad8332..01f85b1 100644
--- a/polkit.spec
+++ b/polkit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package polkit
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,6 @@
 
 
 %define with_systemd 1
-%if 0%{with_systemd}
-%define systemdsystemunitdir %(pkg-config --variable systemdsystemunitdir systemd)
-%endif
 
 Name:           polkit
 Summary:        PolicyKit Authorization Framework
@@ -54,7 +51,9 @@ BuildRequires:  libexpat-devel
 BuildRequires:  libtool
 BuildRequires:  pam-devel
 %if 0%{?with_systemd}
-BuildRequires:  systemd-devel
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(systemd)
 %endif
 %if 0%{?suse_version} >= 1310
 BuildRequires:  pkgconfig(mozjs-17.0)
@@ -238,7 +237,7 @@ exit 0
 # $HOME for polkit user
 %dir %{_localstatedir}/lib/polkit
 %if %{with_systemd}
-%{systemdsystemunitdir}/polkit.service
+%{_unitdir}/polkit.service
 %endif
 
 %files devel