提交 023548c9 编写于 作者: D Daniel P. Berrange

libvirt.spec.in: remove capng conditional

Both RHEL and Fedora build with capng enabled at all
times.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 6c5c56df
...@@ -80,7 +80,6 @@ ...@@ -80,7 +80,6 @@
# A few optional bits off by default, we enable later # A few optional bits off by default, we enable later
%define with_polkit 0%{!?_without_polkit:0} %define with_polkit 0%{!?_without_polkit:0}
%define with_capng 0%{!?_without_capng:0}
%define with_fuse 0%{!?_without_fuse:0} %define with_fuse 0%{!?_without_fuse:0}
%define with_netcf 0%{!?_without_netcf:0} %define with_netcf 0%{!?_without_netcf:0}
%define with_udev 0%{!?_without_udev:0} %define with_udev 0%{!?_without_udev:0}
...@@ -177,7 +176,6 @@ ...@@ -177,7 +176,6 @@
%endif %endif
%define with_polkit 0%{!?_without_polkit:1} %define with_polkit 0%{!?_without_polkit:1}
%define with_capng 0%{!?_without_capng:1}
%define with_netcf 0%{!?_without_netcf:1} %define with_netcf 0%{!?_without_netcf:1}
%define with_udev 0%{!?_without_udev:1} %define with_udev 0%{!?_without_udev:1}
%define with_yajl 0%{!?_without_yajl:1} %define with_yajl 0%{!?_without_yajl:1}
...@@ -455,9 +453,7 @@ BuildRequires: glusterfs-devel >= 3.4.1 ...@@ -455,9 +453,7 @@ BuildRequires: glusterfs-devel >= 3.4.1
# For QEMU/LXC numa info # For QEMU/LXC numa info
BuildRequires: numactl-devel BuildRequires: numactl-devel
%endif %endif
%if %{with_capng}
BuildRequires: libcap-ng-devel >= 0.5.0 BuildRequires: libcap-ng-devel >= 0.5.0
%endif
%if %{with_fuse} %if %{with_fuse}
BuildRequires: fuse-devel >= 2.8.6 BuildRequires: fuse-devel >= 2.8.6
%endif %endif
...@@ -1182,10 +1178,6 @@ rm -rf .git ...@@ -1182,10 +1178,6 @@ rm -rf .git
%define _without_numad --without-numad %define _without_numad --without-numad
%endif %endif
%if ! %{with_capng}
%define _without_capng --without-capng
%endif
%if ! %{with_fuse} %if ! %{with_fuse}
%define _without_fuse --without-fuse %define _without_fuse --without-fuse
%endif %endif
...@@ -1303,7 +1295,7 @@ rm -f po/stamp-po ...@@ -1303,7 +1295,7 @@ rm -f po/stamp-po
%{?_without_storage_gluster} \ %{?_without_storage_gluster} \
%{?_without_numactl} \ %{?_without_numactl} \
%{?_without_numad} \ %{?_without_numad} \
%{?_without_capng} \ --with-capng \
%{?_without_fuse} \ %{?_without_fuse} \
%{?_without_netcf} \ %{?_without_netcf} \
%{?_without_selinux} \ %{?_without_selinux} \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册