Accepting request 400666 from Base:System

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

- systemd.pc is shipped by systemd main package (bsc#983167) (forwarded request 400659 from fbui)

OBS-URL: https://build.opensuse.org/request/show/400666
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/polkit?expand=0&rev=56
This commit is contained in:
Dominique Leuenberger 2016-06-12 16:51:08 +00:00 committed by Git OBS Bridge
commit 2e150fc1e3
2 changed files with 17 additions and 6 deletions

View File

@ -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

View File

@ -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