External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 09:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

libvirt.spec.in: remove hal conditional

Browse Source 
Neither RHEL or Fedora build HAL anymore.

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

15
libvirt.spec.in
View File

@ -87,7 +87,6 @@
%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}
%define with_hal 0%{!?_without_hal:0}
%define with_yajl 0%{!?_without_yajl:0} %define with_yajl 0%{!?_without_yajl:0}
%define with_nwfilter 0%{!?_without_nwfilter:0} %define with_nwfilter 0%{!?_without_nwfilter:0}
%define with_libpcap 0%{!?_without_libpcap:0} %define with_libpcap 0%{!?_without_libpcap:0}
@ -236,7 +235,7 @@
%define with_cgconfig 0%{!?_without_cgconfig:1} %define with_cgconfig 0%{!?_without_cgconfig:1}
%endif %endif
%if %{with_udev} || %{with_hal} %if %{with_udev}
%define with_nodedev 1 %define with_nodedev 1
%else %else
%define with_nodedev 0 %define with_nodedev 0
@ -366,9 +365,6 @@ BuildRequires: libattr-devel
BuildRequires: libblkid-devel >= 2.17 BuildRequires: libblkid-devel >= 2.17
# for augparse, optionally used in testing # for augparse, optionally used in testing
BuildRequires: augeas BuildRequires: augeas
%if %{with_hal}
BuildRequires: hal-devel
%endif
%if %{with_udev} %if %{with_udev}
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: systemd-devel >= 185 BuildRequires: systemd-devel >= 185
@ -653,9 +649,6 @@ Summary: Nodedev driver plugin for the libvirtd daemon
Group: Development/Libraries Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
# needed for device enumeration # needed for device enumeration
%if %{with_hal}
Requires: hal
%endif
%if %{with_udev} %if %{with_udev}
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
Requires: systemd >= 185 Requires: systemd >= 185
@ -1215,10 +1208,6 @@ rm -rf .git
%define _without_apparmor --without-apparmor %define _without_apparmor --without-apparmor
%endif %endif
%if ! %{with_hal}
%define _without_hal --without-hal
%endif
%if ! %{with_udev} %if ! %{with_udev}
%define _without_udev --without-udev %define _without_udev --without-udev
%endif %endif
@ -1330,7 +1319,7 @@ rm -f po/stamp-po
%{?_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} \
%{?_without_sanlock} \ %{?_without_sanlock} \