From 8b2e52b508e52290f9814d92e4fd59cfa0265951da22f33ffd240395000f55d9 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Tue, 1 Sep 2015 07:29:06 +0000 Subject: [PATCH] Accepting request 328241 from home:dimstar:Factory This fixes the "unresolvable" currently seen in openSUSE:Factory; the || : is used in many other places (most often introdcued by jengelh) OBS-URL: https://build.opensuse.org/request/show/328241 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=35 --- pesign.changes | 9 +++++++++ pesign.spec | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pesign.changes b/pesign.changes index 3eba2ed..b880b11 100644 --- a/pesign.changes +++ b/pesign.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 1 06:11:06 UTC 2015 - dimstar@opensuse.org + +- Do not buildrequire systemd: it conflicts with systemd-mini, + which is pulled in by systemd-mini-devel (due to BuildRequires: + pkgconfig(systemd). +- As we lack systemd-tmpfiles in the build env, we ignore the + errors cast in the %post scriptlet. + ------------------------------------------------------------------- Fri Aug 14 07:45:31 UTC 2015 - mpluskal@suse.com diff --git a/pesign.spec b/pesign.spec index b74a37f..07ad17c 100644 --- a/pesign.spec +++ b/pesign.spec @@ -49,7 +49,6 @@ BuildRequires: libuuid-devel BuildRequires: mozilla-nss-devel BuildRequires: pkg-config BuildRequires: popt-devel -BuildRequires: systemd BuildRequires: pkgconfig(systemd) Requires(pre): pwdutils %{?systemd_requires} @@ -99,7 +98,7 @@ getent passwd pesign >/dev/null || useradd -r -g pesign -d %{_localstatedir}/lib %post %service_add_post pesign.service -systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/pesign.conf +systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/pesign.conf || : %postun %service_del_postun pesign.service