Accepting request 604037 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/604037
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libblockdev?expand=0&rev=4

libblockdev-2.16.tar.gz

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

libblockdev-2.17.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49ed2ae9c5edf4f717560bbc9aa43b0a1ce9a0f2836350602fd8c2fc4a81f651
+size 763887

libblockdev-fix-libkmod-include.patch

@@ -10,4 +10,5 @@ Index: src/plugins/kbd.c
  #include <string.h>
  #include <syslog.h>
  #include <glob.h>
+
 --

libblockdev.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri May  4 02:53:53 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 2.17:
+  + New Features:
+    - New plugin: nvdimm. Support for NVDIMM namespaces management;
+    - LUKS2 support for creating LUKS2 format including
+      authenticated disk encryption. Multiple new functions for
+      working with LUKS devices (suspend/resume, header backup,
+      metadata size...);
+    - Extended support for opening TrueCrypt/VeraCrypt volumes.
+- Drop pkgconfig(nss) and libvolume_key-devel BuildRequires now
+  that they are optional and pass without-escrow to configure:
+  libvolume_key's code is ancient and nearly dead upstream.
+
 -------------------------------------------------------------------
 Wed Mar 28 03:13:10 UTC 2018 - luc14n0@linuxmail.org
 

libblockdev.spec

@@ -16,33 +16,30 @@
 #
 
 
-%bcond_with     python2
 %define         bcachetools_version 1.0.8
 %define         lvm2-clvm_version   2.02.156
 %define         somajor             2
 %define         libname             %{name}%{somajor}
-
+%bcond_with     python2
 Name:           libblockdev
+Version:        2.17
+Release:        0
 Summary:        A library for low-level manipulation with block devices
 License:        LGPL-2.1-only
 Group:          Development/Libraries/C and C++
-Version:        2.16
-Release:        0
 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.
-# PATCH-FIX-OPENSUSE libblockdev-fix-libkmod-include.patch luc14n0@linuxmail.org -- openSUSE's libkmod.h file location are not under the expected /usr/include directory but /usr/include/kmod.
 Patch0:         libblockdev-fix-libkmod-include.patch
-
 BuildRequires:  dmraid-devel
 BuildRequires:  gobject-introspection-devel >= 1.3.0
 BuildRequires:  gtk-doc
+BuildRequires:  pkgconfig
 %{?with_python2:BuildRequires: python-devel}
 BuildRequires:  python3-base
 BuildRequires:  python3-devel
 # There is a s390x plugin that, until vtoc.h is provided, can't be added.
 #BuildRequires:  s390-tools-devel
-BuildRequires:  volume_key-devel
 BuildRequires:  pkgconfig(blkid) >= 2.23.0
 BuildRequires:  pkgconfig(bytesize) >= 0.1
 BuildRequires:  pkgconfig(devmapper) >= 1.02.93
@@ -54,7 +51,6 @@ BuildRequires:  pkgconfig(libkmod) >= 19
 BuildRequires:  pkgconfig(libparted) >= 3.1
 BuildRequires:  pkgconfig(libudev) >= 216
 BuildRequires:  pkgconfig(mount) >= 2.23.0
-BuildRequires:  pkgconfig(nss) >= 3.18.0
 Requires:       %{libname} >= %{version}
 
 %description
@@ -117,7 +113,6 @@ Requires:       python3-gobject
 This package contains enhancements to the gobject-introspection bindings for
 LibBlockDev in Python3.
 
-
 %package -n     libbd_btrfs%{somajor}
 Summary:        The BTRFS plugin for the LibBlockDev library
 Group:          System/Libraries
@@ -131,8 +126,8 @@ providing the BTRFS-related functionality.
 %package -n     libbd_btrfs-devel
 Summary:        Development files for the libbd_btrfs plugin/library
 Group:          Development/Libraries/C and C++
-Requires:       libbd_btrfs%{somajor} >= %{version}
 Requires:       glib2-devel
+Requires:       libbd_btrfs%{somajor} >= %{version}
 Requires:       libbd_utils-devel
 Provides:       libblockdev-btrfs-devel = %{version}
 
@@ -140,7 +135,6 @@ 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_crypto%{somajor}
 Summary:        The crypto plugin for the LibBlockDev library
 Group:          System/Libraries
@@ -153,21 +147,20 @@ providing the functionality related to encrypted devices (LUKS).
 %package -n     libbd_crypto-devel
 Summary:        Development files for the libbd_crypto plugin/library
 Group:          Development/Libraries/C and C++
-Requires:       libbd_crypto%{somajor} >= %{version}
 Requires:       glib2-devel
+Requires:       libbd_crypto%{somajor} >= %{version}
 Provides:       libblockdev-crypto-devel = %{version}
 
 %description -n libbd_crypto-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_crypto plugin/library..
 
-
 %package -n     libbd_dm%{somajor}
 Summary:        The Device Mapper plugin for the LibBlockDev library
 Group:          System/Libraries
-Requires:       libbd_utils%{somajor} >= %{version}
 Requires:       device-mapper
 Requires:       dmraid
+Requires:       libbd_utils%{somajor} >= %{version}
 Provides:       libblockdev-dm = %{version}
 
 %description -n libbd_dm%{somajor}
@@ -177,24 +170,23 @@ providing the functionality related to Device Mapper.
 %package -n     libbd_dm-devel
 Summary:        Development files for the libbd_dm plugin/library
 Group:          Development/Libraries/C and C++
-Requires:       libbd_dm%{somajor} >= %{version}
-Requires:       glib2-devel
 Requires:       device-mapper-devel
-Requires:       systemd-devel
 Requires:       dmraid-devel
+Requires:       glib2-devel
+Requires:       libbd_dm%{somajor} >= %{version}
 Requires:       libbd_utils-devel
+Requires:       systemd-devel
 Provides:       libblockdev-dm-devel = %{version}
 
 %description -n libbd_dm-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_dm plugin/library..
 
-
 %package -n     libbd_fs%{somajor}
 Summary:        The FS plugin for the LibBlockDev library
 Group:          System/Libraries
-Requires:       libbd_utils%{somajor} >= %{version}
 Requires:       device-mapper
+Requires:       libbd_utils%{somajor} >= %{version}
 Provides:       libblockdev-fs = %{version}
 
 %description -n libbd_fs%{somajor}
@@ -204,23 +196,22 @@ providing the functionality related to operations with file systems.
 %package -n     libbd_fs-devel
 Summary:        Development files for the libbd_fs plugin/library
 Group:          Development/Libraries/C and C++
+Requires:       dosfstools
+Requires:       glib2-devel
 Requires:       libbd_fs%{somajor} >= %{version}
 Requires:       libbd_utils-devel
-Requires:       glib2-devel
 Requires:       xfsprogs
-Requires:       dosfstools
 Provides:       libblockdev-fs-devel = %{version}
 
 %description -n libbd_fs-devel
 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:       libbd_utils%{somajor} >= %{version}
 Requires:       bcache-tools >= %{bcachetools_version}
+Requires:       libbd_utils%{somajor} >= %{version}
 Provides:       libblockdev-kbd = %{version}
 
 %description -n libbd_kbd%{somajor}
@@ -231,16 +222,15 @@ 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}
-Requires:       glib2-devel
 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
@@ -254,16 +244,15 @@ providing the functionality related to loop devices.
 %package -n     libbd_loop-devel
 Summary:        Development files for the libblockdev-loop plugin/library
 Group:          Development/Libraries/C and C++
+Requires:       glib2-devel
 Requires:       libbd_loop%{somajor} = %{version}
 Requires:       libbd_utils-devel >= %{version}
-Requires:       glib2-devel
 Provides:       libblockdev-loop-devel = %{version}
 
 %description -n libbd_loop-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_loop plugin/library.
 
-
 %package -n     libbd_lvm%{somajor}
 Summary:        The LVM plugin for the LibBlockDev library
 Group:          System/Libraries
@@ -280,16 +269,15 @@ providing the LVM-related functionality.
 %package -n     libbd_lvm-devel
 Summary:        Development files for the libblockdev-lvm plugin/library
 Group:          Development/Libraries/C and C++
+Requires:       glib2-devel
 Requires:       libbd_lvm%{somajor} = %{version}
 Requires:       libbd_utils-devel >= %{version}
-Requires:       glib2-devel
 Provides:       libblockdev-lvm-devel = %{version}
 
 %description -n libbd_lvm-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_lvm plugin/library.
 
-
 %package -n     libbd_lvm-dbus%{somajor}
 Summary:        The LVM plugin for the LibBlockDev library
 Group:          System/Libraries
@@ -306,17 +294,16 @@ providing the LVM-related functionality utilizing the LVM DBus API.
 %package -n     libbd_lvm-dbus-devel
 Summary:        Development files for the libblockdev-lvm-dbus plugin/library
 Group:          Development/Libraries/C and C++
-Requires:       libbd_lvm-dbus%{somajor} = %{version}
-Requires:       libbd_utils-devel >= %{version}
-Requires:       libbd_lvm-devel >= %{version}
 Requires:       glib2-devel
+Requires:       libbd_lvm-dbus%{somajor} = %{version}
+Requires:       libbd_lvm-devel >= %{version}
+Requires:       libbd_utils-devel >= %{version}
 Provides:       libblockdev-lvm-dbus-devel = %{version}
 
 %description -n libbd_lvm-dbus-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_lvm-dbus plugin/library.
 
-
 %package -n     libbd_mdraid%{somajor}
 Summary:        The MD RAID plugin for the LibBlockDev library
 Group:          System/Libraries
@@ -331,16 +318,15 @@ providing the functionality related to MD RAID.
 %package -n     libbd_mdraid-devel
 Summary:        Development files for the libblockdev-mdraid plugin/library
 Group:          Development/Libraries/C and C++
+Requires:       glib2-devel
 Requires:       libbd_mdraid%{somajor} = %{version}
 Requires:       libbd_utils-devel >= %{version}
-Requires:       glib2-devel
 Provides:       libblockdev-mdraid-devel = %{version}
 
 %description -n libbd_mdraid-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_mdraid plugin/library.
 
-
 %package -n     libbd_mpath%{somajor}
 Summary:        The multipath plugin for the LibBlockDev library
 Group:          System/Libraries
@@ -355,22 +341,21 @@ providing the functionality related to multipath devices.
 %package -n     libbd_mpath-devel
 Summary:        Development files for the libblockdev-mpath plugin/library
 Group:          Development/Libraries/C and C++
+Requires:       glib2-devel
 Requires:       libbd_mpath%{somajor} = %{version}
 Requires:       libbd_utils-devel >= %{version}
-Requires:       glib2-devel
 Provides:       libblockdev-mpath-devel = %{version}
 
 %description -n libbd_mpath-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_mpath plugin/library.
 
-
 %package -n     libbd_part%{somajor}
 Summary:        The partitioning plugin for the LibBlockDev library
 Group:          System/Libraries
+Requires:       gptfdisk
 Requires:       libbd_utils%{somajor} >= %{version}
 Requires:       multipath-tools
-Requires:       gptfdisk
 Requires:       util-linux
 Provides:       libblockdev-part = %{version}
 
@@ -381,16 +366,15 @@ providing the functionality related to partitioning.
 %package -n     libbd_part-devel
 Summary:        Development files for the libblockdev-part plugin/library
 Group:          Development/Libraries/C and C++
+Requires:       glib2-devel
 Requires:       libbd_part%{somajor} = %{version}
 Requires:       libbd_utils-devel >= %{version}
-Requires:       glib2-devel
 Provides:       libblockdev-part-devel = %{version}
 
 %description -n libbd_part-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_part plugin/library.
 
-
 %package -n     libbd_swap%{somajor}
 Summary:        The swap plugin for the LibBlockDev library
 Group:          System/Libraries
@@ -405,16 +389,15 @@ providing the functionality related to swap devices.
 %package -n     libbd_swap-devel
 Summary:        Development files for the libblockdev-swap plugin/library
 Group:          Development/Libraries/C and C++
+Requires:       glib2-devel
 Requires:       libbd_swap%{somajor} = %{version}
 Requires:       libbd_utils-devel >= %{version}
-Requires:       glib2-devel
 Provides:       libblockdev-swap-devel = %{version}
 
 %description -n libbd_swap-devel
 This package contains header files and pkg-config files needed for development
 with the libbd_swap plugin/library.
 
-
 %package -n     libbd_utils%{somajor}
 Summary:        Utility functions library for the LibBlockDev library
 Group:          System/Libraries
@@ -426,8 +409,8 @@ LibBlockDev library and its plugins.
 %package -n     libbd_utils-devel
 Summary:        Development files for libbd_utils
 Group:          Development/Libraries/C and C++
-Requires:       libbd_utils%{somajor} >= %{version}
 Requires:       glib2-devel
+Requires:       libbd_utils%{somajor} >= %{version}
 
 %description -n libbd_utils-devel
 This package contains header files and pkg-config files needed for development
@@ -453,17 +436,15 @@ with the libbd_utils library.
         --with-mdraid \
         --with-mpath \
         --with-part \
-    --with-swap
+        --with-swap \
+        --without-escrow \
+        --without-nvdimm
 %make_build
 
 %install
 %make_install
 find %{buildroot} -name "*.la" -print -type f -delete
 
-%if !%{with python2}
-rm -rf %{buildroot}/gi/overrides/
-%endif
-
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig