diff --git a/nbdkit.spec b/nbdkit.spec index 4d5b4c5..0cbbdd0 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -17,7 +17,7 @@ %endif Name: nbdkit -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: NBD server @@ -26,12 +26,6 @@ URL: https://github.com/libguestfs/nbdkit Source0: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz -# Upstream patches to fix the tests. -Patch1: 0001-tests-Provide-full-path-to-Unix-domain-sockets.patch -Patch2: 0002-tests-xz-Use-16M-block-size-when-preparing-disk-for-.patch -# Temporarily because patch2 touches Makefile.am. -BuildRequires: autoconf, automake, libtool - %if 0%{?rhel} == 7 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and # libguestfs was not shipped on POWER (fixed in 7.5). We could in @@ -53,6 +47,7 @@ BuildRequires: libvirt-devel BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: libcurl-devel +BuildRequires: e2fsprogs-devel BuildRequires: perl-devel BuildRequires: perl(ExtUtils::Embed) BuildRequires: python2-devel @@ -170,6 +165,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains cURL (HTTP/FTP/SSH) support for %{name}. +%package plugin-ext2 +Summary: ext2, ext3 and ext4 filesystem support for %{name} +License: BSD + +Requires: %{name}%{?_isa} = %{version}-%{release} + + +%description plugin-ext2 +This package contains ext2, ext3 and ext4 filesystem support for +%{name}. + + %if 0%{?have_libguestfs} %package plugin-guestfs Summary: libguestfs plugin for %{name} @@ -388,8 +395,6 @@ plugins for %{name}. %prep %setup -q %autopatch -p1 -# Temporarily because patch2 touches Makefile.am. -autoreconf -i %ifnarch %{complete_test_arches} # Simplify the test suite so it doesn't require qemu. @@ -528,6 +533,13 @@ popd %{_mandir}/man1/nbdkit-curl-plugin.1* +%files plugin-ext2 +%doc README +%license LICENSE +%{_libdir}/%{name}/plugins/nbdkit-ext2-plugin.so +%{_mandir}/man1/nbdkit-ext2-plugin.1* + + %if 0%{?have_libguestfs} %files plugin-guestfs %doc README @@ -650,6 +662,11 @@ popd %changelog +* Sat Jun 9 2018 Richard W.M. Jones - 1.3.2-1 +- New upstream version 1.3.2. +- Remove patches now upstream. +- New ext2 plugin and subpackage, requires e2fsprogs-devel to build. + * Wed Jun 6 2018 Richard W.M. Jones - 1.3.1-1 - New upstream version 1.3.1. - Add patch to work around libvirt problem with relative socket paths. diff --git a/sources b/sources index 8ec5cd0..5cee21a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nbdkit-1.3.1.tar.gz) = bd4baaebb052ddefec67defcc232768d60d7f630807c0d6d82604de02b10eb496ce3f5bef595fdf1e922f79adf3207799696ab6d7de1602d6660b9f4997862ef +SHA512 (nbdkit-1.3.2.tar.gz) = 03db669bef2fde2714ac5b7143bd1e81517f175dac9913e116d8207dd7fe4aba187478d8b2506cfe296672e89229a530e045f4f50118aa59e03e629939f9d68b