From ba0faf4e789309e14064b13a79d609cce48ce25f0d56264e8c4d86a7203254e7 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 29 Jan 2020 14:48:36 +0000 Subject: [PATCH] Accepting request 766820 from home:dimstar:Factory - BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to shortcut through the -mini flavors. - Use %systemd_ordering instead of systemd_requires: in fact, systemd is not a hard requirement for openvpn. But in case a system is being installed with systemd, we want systemd to be there before openvpn is being installed. OBS-URL: https://build.opensuse.org/request/show/766820 OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=148 --- openvpn.changes | 10 ++++++++++ openvpn.spec | 10 +++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/openvpn.changes b/openvpn.changes index e4e466b..9f00115 100644 --- a/openvpn.changes +++ b/openvpn.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jan 24 11:22:01 UTC 2020 - Dominique Leuenberger + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut through the -mini flavors. +- Use %systemd_ordering instead of systemd_requires: in fact, + systemd is not a hard requirement for openvpn. But in case a + system is being installed with systemd, we want systemd to be + there before openvpn is being installed. + ------------------------------------------------------------------- Tue Jan 7 21:28:42 UTC 2020 - Bjørn Lie diff --git a/openvpn.spec b/openvpn.spec index 5a19f5a..2a42951 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -63,17 +63,13 @@ BuildRequires: xz Requires: iproute2 Requires: pkcs11-helper >= 1.11 %if %{with_systemd} -%{?systemd_requires} +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) +%systemd_ordering %else PreReq: %fillup_prereq PreReq: %insserv_prereq %endif -%if %{with_systemd} -BuildRequires: systemd -%endif -%if %{with_systemd} -BuildRequires: pkgconfig(libsystemd) -%endif %description OpenVPN is a full-featured SSL VPN solution which can accommodate a wide