From 2dd3164d3f31b9856c171ec69f197da65b6961859da56cf3b23700799e222696 Mon Sep 17 00:00:00 2001 From: Luciano Santos Date: Fri, 18 Feb 2022 18:55:15 +0000 Subject: [PATCH] Accepting request 955892 from home:iznogood:branches:GNOME:Next Resub with better .changes OBS-URL: https://build.opensuse.org/request/show/955892 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libblockdev?expand=0&rev=40 --- libblockdev.changes | 11 +++++++++++ libblockdev.spec | 42 ++++++------------------------------------ 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/libblockdev.changes b/libblockdev.changes index b20c31b..834d7e3 100644 --- a/libblockdev.changes +++ b/libblockdev.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jan 27 17:26:35 UTC 2022 - Bjørn Lie + +- Stop packaging deprecated libbd_vdo2 and libbd_vdo-devel, via + passing without-vdo to configure. Also add Obsoletes for both + packages aswell as the 2 alternative package names they provided. + Standalone vdo modules are deprecated in udisks2 since version + 2.9.0, and we have stopped building them there, and udisks2 was + the only known consumer of libblockdevs vdo support, stop + building them here also. + ------------------------------------------------------------------- Tue Jan 18 13:06:33 UTC 2022 - Fabian Vogt diff --git a/libblockdev.spec b/libblockdev.spec index e5a92c8..ec99052 100644 --- a/libblockdev.spec +++ b/libblockdev.spec @@ -31,6 +31,7 @@ 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. Patch0: libblockdev-fix-libkmod-include.patch + BuildRequires: dmraid-devel BuildRequires: gobject-introspection-devel >= 1.3.0 BuildRequires: gtk-doc @@ -68,6 +69,8 @@ no information about VGs when creating an LV). %package -n %{libname} Summary: A library for low-level manipulation with block devices Group: System/Libraries +Obsoletes: libbd_vdo2 <= 2.26 +Obsoletes: libblockdev-vdo <= 2.26 %description -n %{libname} The LibBlockDev is a C library with GObject introspection support that can be @@ -91,6 +94,8 @@ Summary: Development files for the LibBlockDev library Group: Development/Libraries/C and C++ Requires: %{libname} >= %{version} Requires: glib2-devel +Obsoletes: libbd_vdo-devel <= 2.26 +Obsoletes: libblockdev-vdo-devel <= 2.26 %description devel This package provides header files, pkg-config modules and API documentation needed for @@ -418,30 +423,6 @@ Requires: libbd_utils%{somajor} >= %{version} This package contains header files and pkg-config files needed for development with the libbd_utils library. -%package -n libbd_vdo%{somajor} -Summary: The VDO plugin for the LibBlockDev library -Group: System/Libraries -Requires: libbd_utils%{somajor} >= %{version} -Provides: libblockdev-vdo = %{version} - -%description -n libbd_vdo%{somajor} -The VDO library plugin (and, at the same time, a standalone library) -provides functionality related to the Virtual Data Optimizer, -a software for creating compressed and deduplicated pools of -block storage. - -%package -n libbd_vdo-devel -Summary: Development files for the libblockdev-vdo plugin/library -Group: Development/Libraries/C and C++ -Requires: glib2-devel -Requires: libbd_utils-devel >= %{version} -Requires: libbd_vdo%{somajor} = %{version} -Provides: libblockdev-vdo-devel = %{version} - -%description -n libbd_vdo-devel -This package contains header files and pkg-config files needed for development -with the libbd_vdo plugin/library. - %prep %autosetup -p1 @@ -465,7 +446,7 @@ export CFLAGS="%{optflags} -Wno-deprecated-declarations" --with-mpath \ --with-part \ --with-swap \ - --with-vdo \ + --without-vdo \ --without-escrow \ --without-nvdimm \ %{nil} @@ -517,9 +498,6 @@ find %{buildroot} -name "*.la" -print -type f -delete %post -n libbd_utils%{somajor} -p /sbin/ldconfig %postun -n libbd_utils%{somajor} -p /sbin/ldconfig -%post -n libbd_vdo%{somajor} -p /sbin/ldconfig -%postun -n libbd_vdo%{somajor} -p /sbin/ldconfig - %files %dir %{_sysconfdir}/libblockdev %dir %{_sysconfdir}/libblockdev/conf.d @@ -680,12 +658,4 @@ find %{buildroot} -name "*.la" -print -type f -delete %{_includedir}/blockdev/sizes.h %{_includedir}/blockdev/utils.h -%files -n libbd_vdo%{somajor} -%{_libdir}/libbd_vdo.so.%{somajor}* - -%files -n libbd_vdo-devel -%{_libdir}/libbd_vdo.so -%dir %{_includedir}/blockdev -%{_includedir}/blockdev/vdo.h - %changelog