External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

libvirt.spec.in: remove apparmor conditional

Browse Source 
Neither RHEL or Fedora build apparmor

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-05-04 16:24:02 +01:00
parent f134e65c7e
commit 6c5c56df07
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libvirt.spec.in
View File

@ -78,9 +78,6 @@
%define with_numactl 0%{!?_without_numactl:1} %define with_numactl 0%{!?_without_numactl:1}
%define with_selinux 0%{!?_without_selinux:1} %define with_selinux 0%{!?_without_selinux:1}
# Just hardcode to off, since few people ever have apparmor RPMs installed
%define with_apparmor 0%{!?_without_apparmor:0}
# 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_capng 0%{!?_without_capng:0}
@ -389,9 +386,6 @@ BuildRequires: avahi-devel
%if %{with_selinux} %if %{with_selinux}
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
%endif %endif
%if %{with_apparmor}
BuildRequires: libapparmor-devel
%endif
%if %{with_network} %if %{with_network}
BuildRequires: dnsmasq >= 2.41 BuildRequires: dnsmasq >= 2.41
BuildRequires: iptables BuildRequires: iptables
@ -1204,10 +1198,6 @@ rm -rf .git
%define _without_selinux --without-selinux %define _without_selinux --without-selinux
%endif %endif
%if ! %{with_apparmor}
%define _without_apparmor --without-apparmor
%endif
%if ! %{with_udev} %if ! %{with_udev}
%define _without_udev --without-udev %define _without_udev --without-udev
%endif %endif
@ -1318,7 +1308,7 @@ rm -f po/stamp-po
%{?_without_netcf} \ %{?_without_netcf} \
%{?_without_selinux} \ %{?_without_selinux} \
%{?_with_selinux_mount} \ %{?_with_selinux_mount} \
%{?_without_apparmor} \ --without-apparmor \
--without-hal \ --without-hal \
%{?_without_udev} \ %{?_without_udev} \
%{?_without_yajl} \ %{?_without_yajl} \
@ -1788,10 +1778,6 @@ exit 0
%attr(0755, root, root) %{_libexecdir}/libvirt_iohelper %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
%if %{with_apparmor}
%attr(0755, root, root) %{_libexecdir}/virt-aa-helper
%endif
%attr(0755, root, root) %{_sbindir}/libvirtd %attr(0755, root, root) %{_sbindir}/libvirtd
%attr(0755, root, root) %{_sbindir}/virtlogd %attr(0755, root, root) %{_sbindir}/virtlogd
%attr(0755, root, root) %{_sbindir}/virtlockd %attr(0755, root, root) %{_sbindir}/virtlockd