Accepting request 1097042 from home:polslinux:branches:devel:libraries:c_c++

- Update to 3.0.1:
  * VDO a KBD plugins were removed.
  * New NVMe plugin was added.
  * Runtime dependencies are no longer checked during plugin
    initialization.
  * Part plugin was rewritten to use libfdisk instead of libparted
  * Crypto plugin API went through an extensive rewrite.
  * Support for new technologies was added to the crypto plugin:
    FileVault2 encryption, DM Integrity, LUKS2 tokens.
  * Filesystem plugin adds support for btrfs, F2FS, NILFS2,
    exFAT and UDF.
  * Support for new filesystem operations was added to the plugin:
    setting label and UUID, generic mkfs function and API
    for getting feature support for filesystems.
  * dmraid support was removed from the DM plugin.
  * Python 2 support was dropped.
  * loop: define LOOP_SET_BLOCK_SIZE is not defined
  * crypto: Remove stray struct redefinition
  * fs: Simplify struct BDFSInfo
  * vdo_stats: Remove unused libparted include
  * lvm: Make _vglock_start_stop static
  * fs: Add missing copy and free functions to the header file
- Drop no longer needed libblockdev-fix-libkmod-include.patch

OBS-URL: https://build.opensuse.org/request/show/1097042
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libblockdev?expand=0&rev=46

libblockdev-3.0.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:569e47eb322acc6dfe2becb0b575ebd19f0df8dab8dc91ea0280f112d2d9e528
+size 1066201

libblockdev-fix-libkmod-include.patch

@@ -1,14 +0,0 @@
-Index: src/plugins/kbd.c
---- a/src/plugins/kbd.c
-+++ b/src/plugins/kbd.c
-@@ -17,07 +17,07 @@
-  * Author: Vratislav Podzimek <vpodzime@redhat.com>
-  */
- 
--#include <libkmod.h>
-+#include <kmod/libkmod.h>
- #include <string.h>
- #include <syslog.h>
- #include <glob.h>
-
---

libblockdev.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Fri Jun 30 10:16:53 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 3.0.1:
+  * VDO a KBD plugins were removed.
+  * New NVMe plugin was added.
+  * Runtime dependencies are no longer checked during plugin
+    initialization.
+  * Part plugin was rewritten to use libfdisk instead of libparted
+  * Crypto plugin API went through an extensive rewrite.
+  * Support for new technologies was added to the crypto plugin:
+    FileVault2 encryption, DM Integrity, LUKS2 tokens.
+  * Filesystem plugin adds support for btrfs, F2FS, NILFS2,
+    exFAT and UDF.
+  * Support for new filesystem operations was added to the plugin:
+    setting label and UUID, generic mkfs function and API
+    for getting feature support for filesystems.
+  * dmraid support was removed from the DM plugin.
+  * Python 2 support was dropped.
+  * loop: define LOOP_SET_BLOCK_SIZE is not defined
+  * crypto: Remove stray struct redefinition
+  * fs: Simplify struct BDFSInfo
+  * vdo_stats: Remove unused libparted include
+  * lvm: Make _vglock_start_stop static
+  * fs: Add missing copy and free functions to the header file
+- Drop no longer needed libblockdev-fix-libkmod-include.patch
+
 -------------------------------------------------------------------
 Fri Oct  7 12:08:15 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

libblockdev.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libblockdev
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,30 +17,32 @@
 
 
 %define         bcachetools_version 1.0.8
-%define         somajor             2
+%define         somajor             3
 %define         libname             %{name}%{somajor}
-%bcond_with     python2
 
 Name:           libblockdev
-Version:        2.28
+Version:        3.0.1
 Release:        0
 Summary:        A library for low-level manipulation with block devices
 License:        LGPL-2.1-only
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/storaged-project/libblockdev
 Source0:        https://github.com/storaged-project/libblockdev/releases/download/%{version}-1/libblockdev-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE libblockdev-fix-libkmod-include.patch luc14n0@linuxmail.org -- openSUSE's libkmod.h file location is not under the expected /usr/include directory but /usr/include/kmod.
+%if 0%{?suse_version} < 1590
-Patch0:         libblockdev-fix-libkmod-include.patch
+BuildRequires:  gcc11
-
+%endif
 BuildRequires:  dmraid-devel
 BuildRequires:  gobject-introspection-devel >= 1.3.0
 BuildRequires:  gtk-doc
+BuildRequires:  libext2fs-devel
+BuildRequires:  libfdisk-devel
+BuildRequires:  libnvme-devel >= 1.3
 BuildRequires:  pkgconfig
-%{?with_python2:BuildRequires: python-devel}
 BuildRequires:  python3-devel
 # There is a s390x plugin that, until vtoc.h is provided, can't be added.
 #BuildRequires:  s390-tools-devel
 BuildRequires:  pkgconfig(blkid) >= 2.23.0
+BuildRequires:  keyutils-devel
 BuildRequires:  pkgconfig(bytesize) >= 0.1
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(devmapper) >= 1.02.93
@@ -81,11 +83,11 @@ be used as standalone libraries. One of the core principles of LibBlockDev is
 that it is stateless from the storage configuration's perspective (e.g. it has
 no information about VGs when creating an LV).
 
-%package -n     typelib-1_0-BlockDev-2_0
+%package -n     typelib-1_0-BlockDev-3_0
 Summary:        Introspection bindings for the LibBlockDev library
 Group:          System/Libraries
 
-%description -n typelib-1_0-BlockDev-2_0
+%description -n typelib-1_0-BlockDev-3_0
 This package provides the GObject Introspection bindings for LibBlockDev, which
 provides low-level manipulation of block devices.
 
@@ -101,16 +103,6 @@ Obsoletes:      libblockdev-vdo-devel  <= 2.26
 This package provides header files, pkg-config modules and API documentation needed for
 development with the LibBlockDev library.
 
-%package -n     python2-%{name}
-Summary:        Python2 gobject-introspection bindings for the LibBlockDev library
-Group:          Development/Libraries/Python
-Requires:       %{libname} >= %{version}
-Requires:       python2-gobject
-
-%description -n python2-%{name}
-This package contains enhancements to the gobject-introspection bindings for
-LibBlockDev in Python2.
-
 %package -n     python3-%{name}
 Summary:        Python3 gobject-introspection bindings for the LibBlockDev library
 Group:          Development/Libraries/Python
@@ -143,6 +135,28 @@ Provides:       libblockdev-btrfs-devel = %{version}
 This package contains header files and pkg-config files needed for development
 with the libbd_btrfs plugin/library.
 
+%package -n     libbd_nvme%{somajor}
+Summary:        The NVME plugin for the LibBlockDev library
+Group:          System/Libraries
+Requires:       libbd_utils%{somajor} >= %{version}
+Provides:       libblockdev-nvme = %{version}
+
+%description -n libbd_nvme%{somajor}
+This LibBlockDev library plugin (and, at the same time, a standalone library)
+provides NVME-related functionality.
+
+%package -n     libbd_nvme-devel
+Summary:        Development files for the libbd_btrfs plugin/library
+Group:          Development/Libraries/C and C++
+Requires:       glib2-devel
+Requires:       libbd_nvme%{somajor} >= %{version}
+Requires:       libbd_utils-devel
+Provides:       libblockdev-nvme-devel = %{version}
+
+%description -n libbd_nvme-devel
+This package contains header files and pkg-config files needed for development
+with the libbd_nvme plugin/library.
+
 %package -n     libbd_crypto%{somajor}
 Summary:        The crypto plugin for the LibBlockDev library
 Group:          System/Libraries
@@ -215,30 +229,6 @@ Provides:       libblockdev-fs-devel = %{version}
 This package contains header files and pkg-config files needed for development
 with the libbd_fs plugin/library..
 
-%package -n     libbd_kbd%{somajor}
-Summary:        The KBD plugin for the LibBlockDev library
-Group:          System/Libraries
-Requires:       bcache-tools >= %{bcachetools_version}
-Requires:       libbd_utils%{somajor} >= %{version}
-Provides:       libblockdev-kbd = %{version}
-
-%description -n libbd_kbd%{somajor}
-This LibBlockDev library plugin (and, at the same time, a standalone library)
-provides functionality related to kernel block devices, namely zRAM and
-Bcache.
-
-%package -n     libbd_kbd-devel
-Summary:        Development files for the libbd_kbd plugin/library
-Group:          Development/Libraries/C and C++
-Requires:       glib2-devel
-Requires:       libbd_kbd%{somajor} >= %{version}
-Requires:       libbd_utils-devel >= %{version}
-Provides:       libblockdev-kbd-devel = %{version}
-
-%description -n libbd_kbd-devel
-This package contains header files and pkg-config files needed for development
-with the libbd_kbd plugin/library..
-
 %package -n     libbd_loop%{somajor}
 Summary:        The loop plugin for the LibBlockDev library
 Group:          System/Libraries
@@ -428,17 +418,20 @@ with the libbd_utils library.
 
 %build
 export CFLAGS="%{optflags} -Wno-deprecated-declarations"
+%if 0%{?suse_version} < 1590
+    export CC=%{_bindir}/gcc-11
+%endif
+
 %configure \
         --disable-static \
         --enable-introspection \
-        --with-bcache \
         --with-btrfs \
         --with-crypto \
         --with-dm \
-        --with-dmraid \
         --with-fs \
         --with-gtk-doc \
-        --with-kbd \
+        --with-tools \
+        --with-nvme \
         --with-loop \
         --with-lvm \
         --with-lvm_dbus \
@@ -446,7 +439,6 @@ export CFLAGS="%{optflags} -Wno-deprecated-declarations"
         --with-mpath \
         --with-part \
         --with-swap \
-        --without-vdo \
         --without-escrow \
         --without-nvdimm \
         %{nil}
@@ -462,6 +454,9 @@ find %{buildroot} -name "*.la" -print -type f -delete
 %post   -n libbd_btrfs%{somajor} -p /sbin/ldconfig
 %postun -n libbd_btrfs%{somajor} -p /sbin/ldconfig
 
+%post   -n libbd_nvme%{somajor} -p /sbin/ldconfig
+%postun -n libbd_nvme%{somajor} -p /sbin/ldconfig
+
 %post   -n libbd_crypto%{somajor} -p /sbin/ldconfig
 %postun -n libbd_crypto%{somajor} -p /sbin/ldconfig
 
@@ -471,9 +466,6 @@ find %{buildroot} -name "*.la" -print -type f -delete
 %post   -n libbd_fs%{somajor} -p /sbin/ldconfig
 %postun -n libbd_fs%{somajor} -p /sbin/ldconfig
 
-%post   -n libbd_kbd%{somajor} -p /sbin/ldconfig
-%postun -n libbd_kbd%{somajor} -p /sbin/ldconfig
-
 %post   -n libbd_loop%{somajor} -p /sbin/ldconfig
 %postun -n libbd_loop%{somajor} -p /sbin/ldconfig
 
@@ -500,9 +492,11 @@ find %{buildroot} -name "*.la" -print -type f -delete
 
 %files
 %dir %{_sysconfdir}/libblockdev
-%dir %{_sysconfdir}/libblockdev/conf.d
+%dir %{_sysconfdir}/libblockdev/%{somajor}
-%config %{_sysconfdir}/libblockdev/conf.d/00-default.cfg
+%dir %{_sysconfdir}/libblockdev/%{somajor}/conf.d
+%config %{_sysconfdir}/libblockdev/%{somajor}/conf.d/10-lvm-dbus.cfg
 %{_bindir}/lvm-cache-stats
+%{_bindir}/vfat-resize
 
 %files -n %{libname}
 %license LICENSE
@@ -511,29 +505,22 @@ find %{buildroot} -name "*.la" -print -type f -delete
 %{_libdir}/libbd_s390.so*
 %endif
 
-%files -n typelib-1_0-BlockDev-2_0
+%files -n typelib-1_0-BlockDev-3_0
-%{_libdir}/girepository-1.0/BlockDev-2.0.typelib
+%{_libdir}/girepository-1.0/BlockDev-3.0.typelib
 
 %files devel
-%doc features.rst specs.rst
 %doc %{_datadir}/gtk-doc/html/libblockdev
 %{_libdir}/libblockdev.so
 %{_libdir}/pkgconfig/blockdev.pc
-%{_datadir}/gir-1.0/BlockDev-2.0.gir
+%{_datadir}/gir-1.0/BlockDev-3.0.gir
 %dir %{_includedir}/blockdev
 %{_includedir}/blockdev/blockdev.h
 %{_includedir}/blockdev/plugins.h
+%{_includedir}/blockdev/logging.h
 %ifarch s390x
 %{_includedir}/blockdev/s390.h
 %endif
 
-%if %{with python2}
-%files -n python2-%{name}
-%dir %{python2_sitearch}/gi
-%dir %{python2_sitearch}/gi/overrides
-%{python2_sitearch}/gi/overrides/BlockDev.py
-%endif
-
 %files -n python3-%{name}
 %dir %{python3_sitearch}/gi
 %dir %{python3_sitearch}/gi/overrides
@@ -547,6 +534,14 @@ find %{buildroot} -name "*.la" -print -type f -delete
 %dir %{_includedir}/blockdev
 %{_includedir}/blockdev/btrfs.h
 
+%files -n libbd_nvme%{somajor}
+%{_libdir}/libbd_nvme.so.%{somajor}*
+
+%files -n libbd_nvme-devel
+%{_libdir}/libbd_nvme.so
+%dir %{_includedir}/blockdev
+%{_includedir}/blockdev/nvme.h
+
 %files -n libbd_crypto%{somajor}
 %{_libdir}/libbd_crypto.so.%{somajor}*
 
@@ -577,14 +572,11 @@ find %{buildroot} -name "*.la" -print -type f -delete
 %{_includedir}/blockdev/fs/ntfs.h
 %{_includedir}/blockdev/fs/vfat.h
 %{_includedir}/blockdev/fs/xfs.h
-
+%{_includedir}/blockdev/fs/btrfs.h
-%files -n libbd_kbd%{somajor}
+%{_includedir}/blockdev/fs/exfat.h
-%{_libdir}/libbd_kbd.so.%{somajor}*
+%{_includedir}/blockdev/fs/f2fs.h
-
+%{_includedir}/blockdev/fs/nilfs.h
-%files -n libbd_kbd-devel
+%{_includedir}/blockdev/fs/udf.h
-%{_libdir}/libbd_kbd.so
-%dir %{_includedir}/blockdev
-%{_includedir}/blockdev/kbd.h
 
 %files -n libbd_loop%{somajor}
 %{_libdir}/libbd_loop.so.%{somajor}*
@@ -603,8 +595,11 @@ find %{buildroot} -name "*.la" -print -type f -delete
 %{_includedir}/blockdev/lvm.h
 
 %files -n libbd_lvm-dbus%{somajor}
+%dir %{_sysconfdir}/libblockdev
+%dir %{_sysconfdir}/libblockdev/%{somajor}
+%dir %{_sysconfdir}/libblockdev/%{somajor}/conf.d
+%config %{_sysconfdir}/libblockdev/%{somajor}/conf.d/00-default.cfg
 %{_libdir}/libbd_lvm-dbus.so.%{somajor}*
-%config %{_sysconfdir}/libblockdev/conf.d/10-lvm-dbus.cfg
 
 %files -n libbd_lvm-dbus-devel
 %{_libdir}/libbd_lvm-dbus.so
@@ -642,12 +637,10 @@ find %{buildroot} -name "*.la" -print -type f -delete
 %{_includedir}/blockdev/swap.h
 
 %files -n libbd_utils%{somajor}
-%{_libdir}/libbd_part_err.so.%{somajor}*
 %{_libdir}/libbd_utils.so.%{somajor}*
 
 %files -n libbd_utils-devel
 %{_libdir}/libbd_utils.so
-%{_libdir}/libbd_part_err.so
 %{_libdir}/pkgconfig/blockdev-utils.pc
 %dir %{_includedir}/blockdev
 %{_includedir}/blockdev/dbus.h