[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 08/27] libvirt.spec.in: remove apparmor conditional



Neither RHEL or Fedora build apparmor

Signed-off-by: Daniel P. Berrange <berrange redhat com>
---
 libvirt.spec.in | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 9ada4d4..9b3221f 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -78,9 +78,6 @@
 %define with_numactl          0%{!?_without_numactl: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
 %define with_polkit        0%{!?_without_polkit:0}
 %define with_capng         0%{!?_without_capng:0}
@@ -389,9 +386,6 @@ BuildRequires: avahi-devel
 %if %{with_selinux}
 BuildRequires: libselinux-devel
 %endif
-%if %{with_apparmor}
-BuildRequires: libapparmor-devel
-%endif
 %if %{with_network}
 BuildRequires: dnsmasq >= 2.41
 BuildRequires: iptables
@@ -1204,10 +1198,6 @@ rm -rf .git
     %define _without_selinux --without-selinux
 %endif
 
-%if ! %{with_apparmor}
-    %define _without_apparmor --without-apparmor
-%endif
-
 %if ! %{with_udev}
     %define _without_udev --without-udev
 %endif
@@ -1318,7 +1308,7 @@ rm -f po/stamp-po
            %{?_without_netcf} \
            %{?_without_selinux} \
            %{?_with_selinux_mount} \
-           %{?_without_apparmor} \
+           --without-apparmor \
            --without-hal \
            %{?_without_udev} \
            %{?_without_yajl} \
@@ -1788,10 +1778,6 @@ exit 0
 
 %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}/virtlogd
 %attr(0755, root, root) %{_sbindir}/virtlockd
-- 
2.5.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]