diff --git a/nbdkit.spec b/nbdkit.spec index d6309bc..5d7e78c 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -12,11 +12,6 @@ # x86_64 is currently broken in F31 by https://bugzilla.redhat.com/1692047 %global complete_test_arches NONE -# Disable libvirt on riscv64 for now. -%ifnarch riscv64 -%global have_libvirt 1 -%endif - # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 @@ -28,7 +23,7 @@ Name: nbdkit Version: 1.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD server License: BSD @@ -65,9 +60,7 @@ BuildRequires: libselinux-devel %if 0%{?have_libguestfs} BuildRequires: libguestfs-devel %endif -%if 0%{?have_libvirt} BuildRequires: libvirt-devel -%endif BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: libcurl-devel @@ -274,7 +267,6 @@ Requires: genisoimage This package is a virtual ISO 9660 (CD-ROM) plugin for %{name}. -%if 0%{?have_libvirt} %package libvirt-plugin Summary: Libvirt plugin for %{name} License: BSD @@ -286,7 +278,6 @@ Requires: %{name}-server%{?_isa} = %{version}-%{release} This package is a libvirt plugin for %{name}. It lets you access libvirt guest disks readonly. It is implemented using the libvirt virDomainBlockPeek API. -%endif %package linuxdisk-plugin @@ -577,11 +568,6 @@ autoreconf -i --with-libguestfs \ %else --without-libguestfs \ -%endif -%if 0%{?have_libvirt} - --with-libvirt \ -%else - --without-libvirt \ %endif --with-tls-priority=@NBDKIT,SYSTEM @@ -731,13 +717,11 @@ make %{?_smp_mflags} check || { %{_mandir}/man1/nbdkit-iso-plugin.1* -%if 0%{?have_libvirt} %files libvirt-plugin %doc README %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-libvirt-plugin.so %{_mandir}/man1/nbdkit-libvirt-plugin.1* -%endif %files linuxdisk-plugin @@ -906,6 +890,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Nov 15 2019 Richard W.M. Jones - 1.16.0-2 +- Enable libvirt plugin on all architectures. + * Thu Nov 14 2019 Richard W.M. Jones - 1.16.0-1 - New stable release 1.16.0.