diff --git a/.gitignore b/.gitignore index 5f547c5..a2304f8 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /libblockdev-2.17.tar.gz /libblockdev-2.18.tar.gz /libblockdev-2.19.tar.gz +/libblockdev-2.20.tar.gz diff --git a/libblockdev.spec b/libblockdev.spec index 9db4bae..f037503 100644 --- a/libblockdev.spec +++ b/libblockdev.spec @@ -44,17 +44,13 @@ %define lvm_dbus_copts --without-lvm-dbus %endif -# vdo is not available on Fedora -%if (0%{?fedora}) || %{with_vdo} == 0 -%define with_vdo 0 -%define vdo_copts --without-vdo -%endif - -# vdo is available only on x86_64 +# vdo is not available on non-x86_64 on older RHEL +%if (0%{?rhel} && 0%{?rhel} <= 7) %ifnarch x86_64 %define with_vdo 0 %define vdo_copts --without-vdo %endif +%endif # btrfs is not available on RHEL > 7 %if 0%{?rhel} > 7 || %{with_btrfs} == 0 @@ -62,6 +58,11 @@ %define btrfs_copts --without-btrfs %endif +# dmraid is not available on RHEL > 7 +%if 0%{?rhel} > 7 +%define with_dmraid 0 +%endif + %if %{with_btrfs} != 1 %define btrfs_copts --without-btrfs %endif @@ -119,7 +120,7 @@ %define configure_opts %{?python2_copts} %{?python3_copts} %{?bcache_copts} %{?lvm_dbus_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?kbd_copts} %{?part_copts} %{?fs_copts} %{?nvdimm_copts} %{?vdo_copts} %{?gi_copts} Name: libblockdev -Version: 2.19 +Version: 2.20 Release: 1%{?dist} Summary: A library for low-level manipulation with block devices License: LGPLv2+ @@ -274,7 +275,9 @@ BuildRequires: systemd-devel Summary: The Device Mapper plugin for the libblockdev library Requires: %{name}-utils%{?_isa} >= 0.11 Requires: device-mapper +%if %{with_dmraid} Requires: dmraid +%endif %description dm The libblockdev library plugin (and in the same time a standalone library) @@ -542,8 +545,17 @@ BuildRequires: libbytesize-devel BuildRequires: libyaml-devel Summary: The vdo plugin for the libblockdev library Requires: %{name}-utils%{?_isa} >= 0.11 + +# weak dependencies doesn't work on older RHEL +%if (0%{?rhel} && 0%{?rhel} <= 7) Requires: vdo Requires: kmod-kvdo +%else +# we want to build the plugin everywhere but the dependencies might not be +# available so just use weak dependency +Recommends: vdo +Recommends: kmod-kvdo +%endif %description vdo The libblockdev library plugin (and in the same time a standalone library) @@ -945,6 +957,32 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %files plugins-all %changelog +* Wed Sep 26 2018 Vojtech Trefny - 2.20-1 +- Use unsafe caching for storage for devel/testing VMs (v.podzimek) +- Require newer version of cryptsetup for LUKS2 tests (vtrefny) +- Skip nvdimm tests on systems without ndctl (vtrefny) +- Add Ubuntu 18.04 VM configuration to the vagrant template (vtrefny) +- Add some missing test dependencies to the vagrant template (vtrefny) +- Fix how/where the bcache tests are skipped (v.podzimek) +- Document what the 'misc' directory contains (v.podzimek) +- Add a Vagrantfile template (v.podzimek) +- Fix the error message when deleting partition fails (vpodzime) +- Fix build of plugins by changing linking order (devurandom) +- Fix how we check zram stats from /sys/block/zram0/stat (vtrefny) +- lvm-dbus: Fix parsing extra arguments for LVM methods calls (vtrefny) +- Skip MDTestAddRemove on Debian (vtrefny) +- Skip NTFS mount test on Debian testing (vtrefny) +- Skip bcache tests on Debian testing (vtrefny) +- tests: Try harder to get distribution version (vtrefny) +- Mark the function stubs as static (v.podzimek) +- Build the dm plugin without dmraid support on newer RHEL (vtrefny) +- Fix skipping zram tests on Fedora 27 (vtrefny) +- kbd: Check for zram module availability in 'bd_kbd_is_tech_avail' (vtrefny) +- Always build the VDO plugin (vtrefny) +- Do not require 'dmraid' package if built without dmraid support (vtrefny) +- Fix licence header in dbus.c (vtrefny) +- Fix spacing in NEWS.rst (vtrefny) + * Fri Aug 10 2018 Vojtech Trefny - 2.19-1 - Use python interpreter explicitly when running boilerplate_generator.py (vtrefny) - vdo: Implement bd_vdo_get_stats() (tbzatek) diff --git a/sources b/sources index 93a1258..ff79565 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libblockdev-2.19.tar.gz) = bc0e9524b95ca7b32478cb2e9195df336b44921825832393189d04611e6cb634aa033485507239add55d126021f103c7528d912be950c58d46e130c09b4d5167 +SHA512 (libblockdev-2.20.tar.gz) = 7363e05c6854757649ed865f216c71ddc8afd7f1a102a73c0bb4809c4713973462446543d97b696f55f11ea15696e261802567cc545833d16535835c5250ac8b