diff --git a/0001-nvme_Avoid_element-type_g-i_annotations.patch b/0001-nvme_Avoid_element-type_g-i_annotations.patch new file mode 100644 index 0000000000000000000000000000000000000000..60efeeb48aa6ca86b0c4d93873ffc62bb838201a --- /dev/null +++ b/0001-nvme_Avoid_element-type_g-i_annotations.patch @@ -0,0 +1,56 @@ +From 6cce09cff6567caf992dfe37a6e78192117ac040 Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek +Date: Wed, 6 Nov 2024 15:15:10 +0100 +Subject: [PATCH] nvme: Avoid element-type g-i annotations + +For some reason this is causing more harm and seems to work fine +when absent. +--- + src/lib/plugin_apis/nvme.api | 4 ++-- + src/plugins/nvme/nvme.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/lib/plugin_apis/nvme.api b/src/lib/plugin_apis/nvme.api +index 2f17e0c96..604eaf9b1 100644 +--- a/src/lib/plugin_apis/nvme.api ++++ b/src/lib/plugin_apis/nvme.api +@@ -364,7 +364,7 @@ GType bd_nvme_namespace_info_get_type (); + * @features: features and capabilities present for this namespace, see #BDNVMENamespaceFeature. + * @format_progress_remaining: The percentage value remaining of a format operation in progress. + * @write_protected: %TRUE if the namespace is currently write protected and all write access to the namespace shall fail. +- * @lba_formats: (array zero-terminated=1) (element-type BDNVMELBAFormat): A list of supported LBA Formats. ++ * @lba_formats: (array zero-terminated=1): A list of supported LBA Formats. + * @current_lba_format: A LBA Format currently used for the namespace. Contains zeroes in case of + * an invalid or no supported LBA Format reported. + */ +@@ -800,7 +800,7 @@ GType bd_nvme_self_test_log_get_type (); + * BDNVMESelfTestLog: + * @current_operation: Current running device self-test operation. There's no corresponding record in @entries for a device self-test operation that is in progress. + * @current_operation_completion: Percentage of the currently running device self-test operation. Only valid when @current_operation is other than #BD_NVME_SELF_TEST_ACTION_NOT_RUNNING. +- * @entries: (array zero-terminated=1) (element-type BDNVMESelfTestLogEntry): Self-test log entries for the last 20 operations, sorted from newest (first element) to oldest. ++ * @entries: (array zero-terminated=1): Self-test log entries for the last 20 operations, sorted from newest (first element) to oldest. + */ + typedef struct BDNVMESelfTestLog { + BDNVMESelfTestAction current_operation; +diff --git a/src/plugins/nvme/nvme.h b/src/plugins/nvme/nvme.h +index ba5304167..e073a6542 100644 +--- a/src/plugins/nvme/nvme.h ++++ b/src/plugins/nvme/nvme.h +@@ -234,7 +234,7 @@ typedef enum { + * @features: features and capabilities present for this namespace, see #BDNVMENamespaceFeature. + * @format_progress_remaining: The percentage value remaining of a format operation in progress. + * @write_protected: %TRUE if the namespace is currently write protected and all write access to the namespace shall fail. +- * @lba_formats: (array zero-terminated=1) (element-type BDNVMELBAFormat): A list of supported LBA Formats. ++ * @lba_formats: (array zero-terminated=1): A list of supported LBA Formats. + * @current_lba_format: A LBA Format currently used for the namespace. Contains zeroes in case of + * an invalid or no supported LBA Format reported. + */ +@@ -442,7 +442,7 @@ typedef struct BDNVMESelfTestLogEntry { + * BDNVMESelfTestLog: + * @current_operation: Current running device self-test operation. There's no corresponding record in @entries for a device self-test operation that is in progress. + * @current_operation_completion: Percentage of the currently running device self-test operation. Only valid when @current_operation is other than #BD_NVME_SELF_TEST_ACTION_NOT_RUNNING. +- * @entries: (array zero-terminated=1) (element-type BDNVMESelfTestLogEntry): Self-test log entries for the last 20 operations, sorted from newest (first element) to oldest. ++ * @entries: (array zero-terminated=1): Self-test log entries for the last 20 operations, sorted from newest (first element) to oldest. + */ + typedef struct BDNVMESelfTestLog { + BDNVMESelfTestAction current_operation; diff --git a/libblockdev-2.28.tar.gz b/libblockdev-2.28.tar.gz deleted file mode 100644 index fe1a980d63e85c2e38fa4b02211354f23fcadff3..0000000000000000000000000000000000000000 Binary files a/libblockdev-2.28.tar.gz and /dev/null differ diff --git a/libblockdev-3.2.0.tar.gz b/libblockdev-3.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..964c09b779b7a88e39400d075dd9632547741f02 Binary files /dev/null and b/libblockdev-3.2.0.tar.gz differ diff --git a/libblockdev.spec b/libblockdev.spec index 4f62cf5e526e8daf6a2f4c4566434ee5c6e98707..964476682761b70adfb0d1984df49383365629e1 100644 --- a/libblockdev.spec +++ b/libblockdev.spec @@ -1,8 +1,9 @@ -%define anolis_release 5 +%define anolis_release 1 + +%define with_python3 1 %define with_gtk_doc 1 -%define with_bcache 0 -%define with_btrfs 0 +%define with_btrfs 1 %define with_crypto 1 %define with_dm 1 %define with_loop 1 @@ -11,23 +12,18 @@ %define with_mdraid 1 %define with_mpath 1 %define with_swap 1 -%define with_kbd 1 %define with_part 1 %define with_fs 1 %define with_nvdimm 1 -%define with_vdo 0 %define with_gi 1 %define with_escrow 1 -%define with_dmraid 0 %define with_tools 1 +%define with_nvme 1 +%define with_smart 1 +%define with_smartmontools 1 -%if %{with_bcache} == 0 -%define bcache_copts --without-bcache -%endif - -%if %{with_vdo} == 0 -%define vdo_copts --without-vdo -%endif +%define with_btrfs 0 +%define btrfs_copts --without-btrfs %if %{with_btrfs} != 1 %define btrfs_copts --without-btrfs @@ -42,9 +38,6 @@ %if %{with_dm} != 1 %define dm_copts --without-dm %else -%if %{with_dmraid} != 1 -%define dm_copts --without-dmraid -%endif %endif %if %{with_loop} != 1 %define loop_copts --without-loop @@ -64,9 +57,6 @@ %if %{with_swap} != 1 %define swap_copts --without-swap %endif -%if %{with_kbd} != 1 -%define kbd_copts --without-kbd -%endif %if %{with_part} != 1 %define part_copts --without-part %endif @@ -76,25 +66,32 @@ %if %{with_nvdimm} != 1 %define nvdimm_copts --without-nvdimm %endif -%if %{with_vdo} != 1 -%define vdo_copts --without-vdo -%endif %if %{with_tools} != 1 %define tools_copts --without-tools %endif %if %{with_gi} != 1 %define gi_copts --disable-introspection %endif +%if %{with_nvme} != 1 +%define nvme_copts --without-nvme +%endif +%if %{with_smart} != 1 +%define smart_copts --without-smart +%endif +%if %{with_smartmontools} != 1 +%define smartmontools_copts --without-smartmontools +%endif -%define configure_opts %{?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} %{?tools_copts} %{?gi_copts} +%define configure_opts %{?python3_copts} %{?lvm_dbus_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?part_copts} %{?fs_copts} %{?nvdimm_copts} %{?tools_copts} %{?gi_copts} %{?nvme_copts} %{?smart_copts} %{?smartmontools_copts} Name: libblockdev -Version: 2.28 +Version: 3.2.0 Release: %{anolis_release}%{?dist} Summary: A library for low-level manipulation with block devices License: LGPLv2+ URL: https://github.com/storaged-project/libblockdev -Source0: https://github.com/storaged-project/libblockdev/releases/download/%{version}-1/%{name}-%{version}.tar.gz +Source0: https://github.com/storaged-project/libblockdev/releases/download/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-nvme_Avoid_element-type_g-i_annotations.patch BuildRequires: make BuildRequires: glib2-devel @@ -108,6 +105,14 @@ BuildRequires: gtk-doc BuildRequires: glib2-doc BuildRequires: autoconf-archive +# obsolete removed subpackages to allow upgrades +Provides: libblockdev-kbd = %{version}-%{release} +Obsoletes: libblockdev-kbd < %{version}-%{release} +Provides: libblockdev-vdo = %{version}-%{release} +Obsoletes: libblockdev-vdo < %{version}-%{release} + +Requires: %{name}-utils = %{version}-%{release} + %description The libblockdev is a C library with GObject introspection support that can be used for doing low-level operations with block devices like setting up LVM, @@ -120,8 +125,15 @@ no information about VGs when creating an LV). %package devel Summary: Development files for libblockdev Requires: %{name} = %{version}-%{release} +Requires: %{name}-utils-devel = %{version}-%{release} Requires: glib2-devel +# obsolete removed devel subpackages to allow upgrades +Provides: libblockdev-kbd-devel = %{version}-%{release} +Obsoletes: libblockdev-kbd-devel < %{version}-%{release} +Provides: libblockdev-vdo-devel = %{version}-%{release} +Obsoletes: libblockdev-vdo-devel < %{version}-%{release} + %description devel This package contains header files and pkg-config files needed for development with the libblockdev library. @@ -130,6 +142,7 @@ with the libblockdev library. Summary: Python3 gobject-introspection bindings for libblockdev Requires: %{name} = %{version}-%{release} Requires: python3-gobject-base +Requires: python3-bytesize %{?python_provide:%python_provide python3-blockdev} %description -n python3-blockdev @@ -158,7 +171,7 @@ with the libblockdev-utils library. %package btrfs BuildRequires: libbytesize-devel Summary: The BTRFS plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 +Requires: %{name}-utils = %{version}-%{release} Requires: btrfs-progs %description btrfs @@ -169,7 +182,7 @@ providing the BTRFS-related functionality. Summary: Development files for the libblockdev-btrfs plugin/library Requires: %{name}-btrfs = %{version}-%{release} Requires: glib2-devel -Requires: %{name}-utils-devel +Requires: %{name}-utils-devel %description btrfs-devel This package contains header files and pkg-config files needed for development @@ -179,8 +192,10 @@ with the libblockdev-btrfs plugin/library. %if %{with_crypto} %package crypto +Requires: %{name}-utils = %{version}-%{release} BuildRequires: cryptsetup-devel BuildRequires: libblkid-devel +BuildRequires: keyutils-libs-devel %if %{with_escrow} BuildRequires: volume_key-devel >= 0.3.9-7 @@ -196,6 +211,7 @@ providing the functionality related to encrypted devices (LUKS). %package crypto-devel Summary: Development files for the libblockdev-crypto plugin/library Requires: %{name}-crypto = %{version}-%{release} +Requires: %{name}-utils-devel = %{version}-%{release} Requires: glib2-devel %description crypto-devel @@ -207,16 +223,10 @@ with the libblockdev-crypto plugin/library. %if %{with_dm} %package dm BuildRequires: device-mapper-devel -%if %{with_dmraid} -BuildRequires: dmraid-devel -%endif BuildRequires: systemd-devel Summary: The Device Mapper plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 +Requires: %{name}-utils = %{version}-%{release} Requires: device-mapper -%if %{with_dmraid} -Requires: dmraid -%endif %description dm The libblockdev library plugin (and in the same time a standalone library) @@ -228,9 +238,6 @@ Requires: %{name}-dm = %{version}-%{release} Requires: glib2-devel Requires: device-mapper-devel Requires: systemd-devel -%if %{with_dmraid} -Requires: dmraid-devel -%endif Requires: %{name}-utils-devel %description dm-devel @@ -241,12 +248,12 @@ with the libblockdev-dm plugin/library. %if %{with_fs} %package fs -BuildRequires: parted-devel BuildRequires: libblkid-devel BuildRequires: libmount-devel +BuildRequires: libuuid-devel +BuildRequires: e2fsprogs-devel Summary: The FS plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 - +Requires: %{name}-utils = %{version}-%{release} %description fs The libblockdev library plugin (and in the same time a standalone library) providing the functionality related to operations with file systems. @@ -256,8 +263,6 @@ Summary: Development files for the libblockdev-fs plugin/library Requires: %{name}-fs = %{version}-%{release} Requires: %{name}-utils-devel Requires: glib2-devel -Requires: xfsprogs -Requires: dosfstools %description fs-devel This package contains header files and pkg-config files needed for development @@ -265,36 +270,10 @@ with the libblockdev-fs plugin/library. %endif -%if %{with_kbd} -%package kbd -BuildRequires: libbytesize-devel -Summary: The KBD plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 -%if %{with_bcache} -Requires: bcache-tools >= 1.0.8 -%endif - -%description kbd -The libblockdev library plugin (and in the same time a standalone library) -providing the functionality related to kernel block devices (namely zRAM and -Bcache). - -%package kbd-devel -Summary: Development files for the libblockdev-kbd plugin/library -Requires: %{name}-kbd = %{version}-%{release} -Requires: %{name}-utils-devel -Requires: glib2-devel - -%description kbd-devel -This package contains header files and pkg-config files needed for development -with the libblockdev-kbd plugin/library. -%endif - - %if %{with_loop} %package loop Summary: The loop plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 +Requires: %{name}-utils = %{version}-%{release} %description loop The libblockdev library plugin (and in the same time a standalone library) @@ -315,8 +294,9 @@ with the libblockdev-loop plugin/library. %if %{with_lvm} %package lvm BuildRequires: device-mapper-devel +BuildRequires: libyaml-devel Summary: The LVM plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 +Requires: %{name}-utils = %{version}-%{release} Requires: lvm2 %description lvm @@ -337,8 +317,9 @@ with the libblockdev-lvm plugin/library. %if %{with_lvm_dbus} %package lvm-dbus BuildRequires: device-mapper-devel +BuildRequires: libyaml-devel Summary: The LVM plugin for the libblockdev library -Requires: %{name}-utils >= 1.4 +Requires: %{name}-utils = %{version}-%{release} Requires: lvm2-dbusd >= 2.02.156 %description lvm-dbus @@ -348,7 +329,7 @@ providing the LVM-related functionality utilizing the LVM DBus API. %package lvm-dbus-devel Summary: Development files for the libblockdev-lvm-dbus plugin/library Requires: %{name}-lvm-dbus = %{version}-%{release} -Requires: %{name}-utils-devel >= 1.4 +Requires: %{name}-utils-devel = %{version}-%{release} Requires: glib2-devel %description lvm-dbus-devel @@ -361,7 +342,7 @@ with the libblockdev-lvm-dbus plugin/library. %package mdraid BuildRequires: libbytesize-devel Summary: The MD RAID plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 +Requires: %{name}-utils = %{version}-%{release} Requires: mdadm %description mdraid @@ -384,7 +365,7 @@ with the libblockdev-mdraid plugin/library. %package mpath BuildRequires: device-mapper-devel Summary: The multipath plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 +Requires: %{name}-utils = %{version}-%{release} Recommends: device-mapper-multipath %description mpath @@ -407,7 +388,7 @@ with the libblockdev-mpath plugin/library. BuildRequires: ndctl-devel BuildRequires: libuuid-devel Summary: The NVDIMM plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 +Requires: %{name}-utils = %{version}-%{release} Requires: ndctl %description nvdimm @@ -426,12 +407,34 @@ with the libblockdev-nvdimm plugin/library. %endif +%if %{with_nvme} +%package nvme +BuildRequires: libnvme-devel +BuildRequires: libuuid-devel +Summary: The NVMe plugin for the libblockdev library +Requires: %{name}-utils = %{version}-%{release} + +%description nvme +The libblockdev library plugin (and in the same time a standalone library) +providing the functionality related to operations with NVMe devices. + +%package nvme-devel +Summary: Development files for the libblockdev-nvme plugin/library +Requires: %{name}-nvme = %{version}-%{release} +Requires: %{name}-utils-devel = %{version}-%{release} +Requires: glib2-devel + +%description nvme-devel +This package contains header files and pkg-config files needed for development +with the libblockdev-nvme plugin/library. +%endif + + %if %{with_part} %package part -BuildRequires: parted-devel +BuildRequires: libfdisk-devel Summary: The partitioning plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 -Requires: gdisk +Requires: %{name}-utils = %{version}-%{release} Requires: util-linux %description part @@ -450,11 +453,58 @@ with the libblockdev-part plugin/library. %endif +%if %{with_smart} +%package smart +BuildRequires: libatasmart-devel >= 0.17 +Summary: The smart plugin for the libblockdev library +Requires: %{name}-utils = %{version}-%{release} + +%description smart +The libblockdev library plugin (and in the same time a standalone library) +providing S.M.A.R.T. monitoring and testing functionality, based +on libatasmart. + +%package smart-devel +Summary: Development files for the libblockdev-smart plugin/library +Requires: %{name}-smart = %{version}-%{release} +Requires: %{name}-utils-devel = %{version}-%{release} +Requires: glib2-devel + +%description smart-devel +This package contains header files and pkg-config files needed for development +with the libblockdev-smart plugin/library. +%endif + + +%if %{with_smartmontools} +%package smartmontools +BuildRequires: json-glib-devel +Summary: The smartmontools plugin for the libblockdev library +Requires: %{name}-utils = %{version}-%{release} +Requires: smartmontools >= 7.0 + +%description smartmontools +The libblockdev library plugin (and in the same time a standalone library) +providing S.M.A.R.T. monitoring and testing functionality, based +on smartmontools. + +%package smartmontools-devel +Summary: Development files for the libblockdev-smart plugin/library +Requires: %{name}-smartmontools = %{version}-%{release} +Requires: %{name}-utils-devel = %{version}-%{release} +Requires: glib2-devel + +%description smartmontools-devel +This package contains header files and pkg-config files needed for development +with the libblockdev-smart plugin/library. +%endif + + %if %{with_swap} %package swap BuildRequires: libblkid-devel Summary: The swap plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 +Requires: %{name}-utils = %{version}-%{release} Requires: util-linux %description swap @@ -472,40 +522,13 @@ This package contains header files and pkg-config files needed for development with the libblockdev-swap plugin/library. %endif - -%if %{with_vdo} -%package vdo -BuildRequires: libbytesize-devel -BuildRequires: libyaml-devel -Summary: The vdo plugin for the libblockdev library -Requires: %{name}-utils >= 0.11 - -# we want to build the plugin everywhere but the dependencies might not be -# available so just use weak dependency -Recommends: vdo -Recommends: kmod-kvdo - -%description vdo -The libblockdev library plugin (and in the same time a standalone library) -providing the functionality related to VDO devices. - -%package vdo-devel -Summary: Development files for the libblockdev-vdo plugin/library -Requires: %{name}-vdo = %{version}-%{release} -Requires: %{name}-utils-devel -Requires: glib2-devel - -%description vdo-devel -This package contains header files and pkg-config files needed for development -with the libblockdev-vdo plugin/library. -%endif - %if %{with_tools} %package tools Summary: Various nice tools based on libblockdev Requires: %{name} Requires: %{name}-lvm BuildRequires: libbytesize-devel +BuildRequires: parted-devel %if %{with_lvm_dbus} == 1 Recommends: %{name}-lvm-dbus %endif @@ -515,6 +538,27 @@ Various nice storage-related tools based on libblockdev. %endif +%ifarch s390 s390x +%package s390 +Summary: The s390 plugin for the libblockdev library +Requires: %{name}-utils = %{version}-%{release} +Requires: s390utils + +%description s390 +The libblockdev library plugin (and in the same time a standalone library) +providing the functionality related to s390 devices. + +%package s390-devel +Summary: Development files for the libblockdev-s390 plugin/library +Requires: %{name}-s390 = %{version}-%{release} +Requires: %{name}-utils-devel = %{version}-%{release} +Requires: glib2-devel + +%description s390-devel +This package contains header files and pkg-config files needed for development +with the libblockdev-s390 plugin/library. +%endif + %package plugins-all Summary: Meta-package that pulls all the libblockdev plugins as dependencies Requires: %{name} = %{version}-%{release} @@ -535,10 +579,6 @@ Requires: %{name}-dm = %{version}-%{release} Requires: %{name}-fs = %{version}-%{release} %endif -%if %{with_kbd} -Requires: %{name}-kbd = %{version}-%{release} -%endif - %if %{with_loop} Requires: %{name}-loop = %{version}-%{release} %endif @@ -559,16 +599,28 @@ Requires: %{name}-mpath = %{version}-%{release} Requires: %{name}-nvdimm = %{version}-%{release} %endif +%if %{with_nvme} +Requires: %{name}-nvme = %{version}-%{release} +%endif + %if %{with_part} Requires: %{name}-part = %{version}-%{release} %endif +%if %{with_smart} +Requires: %{name}-smart = %{version}-%{release} +%endif + +%if %{with_smartmontools} +Requires: %{name}-smartmontools = %{version}-%{release} +%endif + %if %{with_swap} Requires: %{name}-swap = %{version}-%{release} %endif -%if %{with_vdo} -Requires: %{name}-vdo = %{version}-%{release} +%ifarch s390 s390x +Requires: %{name}-s390 = %{version}-%{release} %endif %description plugins-all @@ -583,7 +635,7 @@ BuildArch: noarch The %{name}-doc package contains documentation files for %{name}. %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %build autoreconf -ivf @@ -639,20 +691,28 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %ldconfig_scriptlets nvdimm %endif +%if %{with_nvme} +%ldconfig_scriptlets nvme +%endif + %if %{with_part} %ldconfig_scriptlets part %endif -%if %{with_swap} -%ldconfig_scriptlets swap +%if %{with_smart} +%ldconfig_scriptlets smart +%endif + +%if %{with_smartmontools} +%ldconfig_scriptlets smartmontools %endif -%if %{with_vdo} -%ldconfig_scriptlets vdo +%if %{with_swap} +%ldconfig_scriptlets swap %endif -%if %{with_kbd} -%ldconfig_scriptlets kbd +%ifarch s390 s390x +%ldconfig_scriptlets s390 %endif @@ -666,11 +726,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %dir %{abidir} %{abidir}/libblockdev.dump %dir %{_sysconfdir}/libblockdev -%dir %{_sysconfdir}/libblockdev/conf.d -%config %{_sysconfdir}/libblockdev/conf.d/00-default.cfg +%dir %{_sysconfdir}/libblockdev/3/conf.d +%config %{_sysconfdir}/libblockdev/3/conf.d/00-default.cfg %files devel -%doc features.rst specs.rst %{_libdir}/libblockdev.so %dir %{_includedir}/blockdev %{_includedir}/blockdev/blockdev.h @@ -689,13 +748,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %files utils %{_libdir}/libbd_utils.so.* -%{_libdir}/libbd_part_err.so.* %{abidir}/libbd_utils.dump -%{abidir}/libbd_part_err.dump %files utils-devel %{_libdir}/libbd_utils.so -%{_libdir}/libbd_part_err.so %{_libdir}/pkgconfig/blockdev-utils.pc %dir %{_includedir}/blockdev %{_includedir}/blockdev/utils.h @@ -705,6 +761,7 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %{_includedir}/blockdev/dev_utils.h %{_includedir}/blockdev/module.h %{_includedir}/blockdev/dbus.h +%{_includedir}/blockdev/logging.h %if %{with_btrfs} @@ -757,18 +814,6 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %endif -%if %{with_kbd} -%files kbd -%{_libdir}/libbd_kbd.so.* -%{abidir}/libbd_kbd.dump - -%files kbd-devel -%{_libdir}/libbd_kbd.so -%dir %{_includedir}/blockdev -%{_includedir}/blockdev/kbd.h -%endif - - %if %{with_loop} %files loop %{_libdir}/libbd_loop.so.* @@ -797,7 +842,7 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %files lvm-dbus %{_libdir}/libbd_lvm-dbus.so.* %{abidir}/libbd_lvm-dbus.dump -%config %{_sysconfdir}/libblockdev/conf.d/10-lvm-dbus.cfg +%config %{_sysconfdir}/libblockdev/3/conf.d/10-lvm-dbus.cfg %files lvm-dbus-devel %{_libdir}/libbd_lvm-dbus.so @@ -842,6 +887,18 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %endif +%if %{with_nvme} +%files nvme +%{_libdir}/libbd_nvme.so.* +%{abidir}/libbd_nvme.dump + +%files nvme-devel +%{_libdir}/libbd_nvme.so +%dir %{_includedir}/blockdev +%{_includedir}/blockdev/nvme.h +%endif + + %if %{with_part} %files part %{_libdir}/libbd_part.so.* @@ -854,6 +911,30 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %endif +%if %{with_smart} +%files smart +%{_libdir}/libbd_smart.so.* +%{abidir}/libbd_smart.dump + +%files smart-devel +%{_libdir}/libbd_smart.so +%dir %{_includedir}/blockdev +%{_includedir}/blockdev/smart.h +%endif + + +%if %{with_smartmontools} +%files smartmontools +%{_libdir}/libbd_smartmontools.so.* +%{abidir}/libbd_smartmontools.dump + +%files smartmontools-devel +%{_libdir}/libbd_smartmontools.so +%dir %{_includedir}/blockdev +%{_includedir}/blockdev/smart.h +%endif + + %if %{with_swap} %files swap %{_libdir}/libbd_swap.so.* @@ -866,28 +947,32 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %endif -%if %{with_vdo} -%files vdo -%{_libdir}/libbd_vdo.so.* -%{abidir}/libbd_vdo.dump - -%files vdo-devel -%{_libdir}/libbd_vdo.so -%dir %{_includedir}/blockdev -%{_includedir}/blockdev/vdo.h -%endif - %if %{with_tools} %files tools %{_bindir}/lvm-cache-stats +%{_bindir}/vfat-resize +%{abidir}/vfat-resize-option.list +%endif + +%ifarch s390 s390x +%files s390 +%{_libdir}/libbd_s390.so.* + +%files s390-devel +%{_libdir}/libbd_s390.so +%dir %{_includedir}/blockdev +%{_includedir}/blockdev/s390.h %endif %files plugins-all %files doc -%doc README.md features.rst +%doc README.md %changelog +* Fri Feb 28 2025 Xiaoping Liu - 3.2.0-1 +- Refer to CentOS Stream libfido2-3.2.0-2 (vtrefny@redhat.com) + * Tue Mar 12 2024 Bo Ren - 2.28-5 - Rebuild with python3.11