From 2ff63ae014f8fcc7bc86d1f4fb037ccb25d77c30 Mon Sep 17 00:00:00 2001 From: Flavio Leitner Date: Thu, 1 Oct 2015 19:31:09 -0300 Subject: [PATCH 1/1] rhel: Add optional BuildRequires to libcap-ng Commit e91b927d8 (lib/daemon: support --user option for all OVS daemon) added optional usage of the libcap-ng library. It's packaged in Fedora, so go ahead and added it by default to the Fedora spec file. Our default systemd unit files don't make use of the --user option that requires this library, but conceivably someone may want to customize them and use this option. For those that don't want to use --user option, the Fedora package offers an option (--without libcapng) to build the RPMs without it. Signed-off-by: Flavio Leitner Acked-by: Russell Bryant Signed-off-by: Ben Pfaff --- rhel/openvswitch-fedora.spec.in | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 695f1d7cb..066086c50 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -13,6 +13,10 @@ #%define kernel 2.6.40.4-5.fc15.x86_64 +# If libcap-ng isn't available and there is no need for running OVS +# as regular user, specify the '--without libcapng' +%bcond_without libcapng + # Enable PIE, bz#955181 %global _hardened_build 1 @@ -42,6 +46,9 @@ BuildRequires: desktop-file-utils BuildRequires: groff graphviz # make check dependencies BuildRequires: procps-ng +%if %{with libcapng} +BuildRequires: libcap-ng libcap-ng-devel +%endif Requires: openssl iproute module-init-tools #Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3 @@ -104,7 +111,15 @@ overlays and security groups. %setup -q %build -%configure --enable-ssl --with-pkidir=%{_sharedstatedir}/openvswitch/pki +%configure \ +%if %{with libcapng} + --enable-libcapng \ +%else + --disable-libcapng \ +%endif + --enable-ssl \ + --with-pkidir=%{_sharedstatedir}/openvswitch/pki + make %{?_smp_mflags} %install -- 2.20.1