Accepting request 841376 from Base:System

OBS-URL: https://build.opensuse.org/request/show/841376
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=140
This commit is contained in:
Dominique Leuenberger 2020-10-15 11:44:38 +00:00 committed by Git OBS Bridge
commit 7f92695cca
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 12 10:00:20 UTC 2020 - ghe@suse.com
- Update lvm2.spec file (bsc#1174336)
- enable lvmlockd remote refresh using libdlmcontrol
- update libdlm dependency relationship
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 03 08:16:00 UTC 2020 - heming.zhao@suse.com Thu Sep 03 08:16:00 UTC 2020 - heming.zhao@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package lvm2 # spec file for package lvm2
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,7 +25,7 @@
%define device_mapper_version 1.02.173 %define device_mapper_version 1.02.173
%define thin_provisioning_version 0.7.0 %define thin_provisioning_version 0.7.0
%define _supportsanlock 0 %define _supportsanlock 0
%define dlm_version 4.0 %define dlm_version 4.0.9
# from lvm2 version 2.03, suse obsoleted clvm, cmirrord, liblvm2app & liblvm2cmd. # from lvm2 version 2.03, suse obsoleted clvm, cmirrord, liblvm2app & liblvm2cmd.
# so the obseletes version is 2.03 # so the obseletes version is 2.03
%define lvm2_clvm_version 2.03 %define lvm2_clvm_version 2.03
@ -100,7 +100,7 @@ BuildRequires: pkgconfig(systemd)
BuildRequires: libcorosync-devel BuildRequires: libcorosync-devel
BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(blkid)
%if %{with lockd} %if %{with lockd}
BuildRequires: libdlm-devel BuildRequires: libdlm-devel >= %{dlm_version}
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
%if 0%{_supportsanlock} == 1 %if 0%{_supportsanlock} == 1
BuildRequires: sanlock-devel >= %{sanlock_version} BuildRequires: sanlock-devel >= %{sanlock_version}
@ -162,6 +162,7 @@ extra_opts="
--with-default-pid-dir=/run --with-default-pid-dir=/run
--with-default-run-dir=/run/lvm --with-default-run-dir=/run/lvm
--enable-lvmlockd-dlm --enable-lvmlockd-dlm
--enable-lvmlockd-dlmcontrol
%if 0%{_supportsanlock} == 1 %if 0%{_supportsanlock} == 1
--enable-lvmlockd-sanlock --enable-lvmlockd-sanlock
%endif %endif
@ -425,8 +426,8 @@ Summary: LVM locking daemon
Group: System/Base Group: System/Base
Requires: corosync Requires: corosync
Requires: device-mapper >= %{device_mapper_version} Requires: device-mapper >= %{device_mapper_version}
Requires: libdlm >= %{dlm_version}
Requires: lvm2 = %{version} Requires: lvm2 = %{version}
Recommends: libdlm >= %{dlm_version}
Obsoletes: lvm2-clvm <= %{lvm2_clvm_version} Obsoletes: lvm2-clvm <= %{lvm2_clvm_version}
%{?systemd_requires} %{?systemd_requires}
%if 0%{_supportsanlock} == 1 %if 0%{_supportsanlock} == 1