From aef701379e404d16de8ba301253a55cdce65da1d08a5095d3ac2138414677d6d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 9 Jun 2016 15:36:14 +0000 Subject: [PATCH] Accepting request 400565 from home:fbui:branches:network - Do not rely on systemd.pc to find out where systemd unit dir is located (bsc#983167) OBS-URL: https://build.opensuse.org/request/show/400565 OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=62 --- rpcbind.changes | 13 +++++++++++++ rpcbind.spec | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/rpcbind.changes b/rpcbind.changes index b36764e..1ede68d 100644 --- a/rpcbind.changes +++ b/rpcbind.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jun 7 17:04:12 UTC 2016 - fbui@suse.com + +- Do not rely on systemd.pc to find out where systemd unit dir is located (bsc#983167) + systemd.pc is part of systemd main package now. Instead of + build-requiring systemd, import systemd-rpm-macros which has the + %{_unitdir} definition and much less dependencies than systemd and + use it when configuring rpcbind so it won't try to find the unit dir + by using pkg-config. + + Also replace BR libsystemd-daemon by libsystemd since the former is + obsolete and is replaced by the later. + ------------------------------------------------------------------- Mon Mar 14 14:48:36 CET 2016 - kukuk@suse.de diff --git a/rpcbind.spec b/rpcbind.spec index ecf6b2b..b9274e6 100644 --- a/rpcbind.spec +++ b/rpcbind.spec @@ -31,8 +31,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libtirpc-devel >= 1.0.1 BuildRequires: libtool BuildRequires: pkgconfig +BuildRequires: systemd-rpm-macros BuildRequires: tcpd-devel -BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd) PreReq: %fillup_prereq Requires(pre): /usr/sbin/useradd Patch1: 0001-systemd-unit-files.patch @@ -87,7 +88,8 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now" --enable-warmstarts \ --disable-debug \ --with-statedir=%{_localstatedir}/lib/rpcbind \ - --with-rpcuser=rpc + --with-rpcuser=rpc \ + --with-systemdsystemunitdir=%{_unitdir} %{__make} %{?jobs:-j%jobs} %{__cc} -I/usr/include/tirpc -pie -fpie -fwhole-program -Wl,-z,relro,-z,now %{optflags} pmap_set.c -o pmap_set -ltirpc