rpm/lvm2
SHA256
1
0
Fork 0
forked from pool/lvm2
Code Pull Requests Activity

Accepting request 728458 from home:hmzhao:branches:openSUSE:Factory

Browse Source 
upgrade lvm2 from 2.02.180 to 2.03.05. 
this upgrade only for opensuse & sles-15sp2

OBS-URL: https://build.opensuse.org/request/show/728458
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=249
This commit is contained in:
Gang He
2019-09-05 10:03:51 +00:00
committed by Git OBS Bridge
parent 0badf76b5c
commit 5c670ebc3c
8 changed files with 311 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lvm2.spec
View File

@@ -32,13 +32,13 @@
%global flavor @BUILD_FLAVOR@%{nil}
%define psuffix %{nil}
%if "%{flavor}" == "devicemapper"
%define psuffix -devicemapper
%define psuffix -device-mapper
%bcond_without devicemapper
%else
%bcond_with devicemapper
%endif
%if "%{flavor}" == "lockd"
%define psuffix -clustering
%define psuffix -lvmlockd
%bcond_without lockd
%else
%bcond_with lockd
@@ -54,7 +54,7 @@ Source: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
Source1: lvm.conf
Source42: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz.asc
# Upstream patches
#Patch0001: bug-1122666_devices-drop-open-error-message.patch
Patch0001: bug-1122666_devices-drop-open-error-message.patch
# SUSE patches: 1000+ for LVM
# Never upstream
Patch1001: cmirrord_remove_date_time_from_compilation.patch
@@ -67,6 +67,12 @@ Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.p
Patch3001: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
# patches specif for lvm2.spec
Patch4001: bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch
# To detect modprobe during build
BuildRequires: kmod-compat
BuildRequires: libaio-devel
BuildRequires: pkgconfig
BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
BuildRequires: pkgconfig(libudev)
Requires: device-mapper >= %{device_mapper_version}
Requires: modutils
Requires(post): coreutils
@@ -76,41 +82,22 @@ Obsoletes: lvm2-cmirrord
%{?systemd_requires}
%if %{with devicemapper}
BuildRequires: gcc-c++
BuildRequires: kmod-compat
BuildRequires: libaio-devel
BuildRequires: pkgconfig
BuildRequires: suse-module-tools
BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libsepol)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(systemd)
%else
%if %{with lockd}
# To detect modprobe during build
BuildRequires: kmod-compat
BuildRequires: libaio-devel
BuildRequires: libcorosync-devel
BuildRequires: libdlm-devel
BuildRequires: pkgconfig
BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
BuildRequires: pkgconfig(blkid)
BuildRequires: pkgconfig(libudev)
%if %{with lockd}
BuildRequires: libdlm-devel
%if 0%{_supportsanlock} == 1
BuildRequires: sanlock-devel >= %{sanlock_version}
%endif
%else
BuildRequires: gcc-c++
# To detect modprobe during build
BuildRequires: kmod-compat
BuildRequires: libaio-devel
BuildRequires: libcorosync-devel
BuildRequires: libselinux-devel
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: thin-provisioning-tools >= %{thin_provisioning_version}
BuildRequires: pkgconfig(blkid)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
%endif
@@ -122,7 +109,7 @@ Volume Manager.
%prep
%setup -q -n LVM2.%{version}
#%patch0001 -p1
%patch0001 -p1
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
@@ -138,7 +125,6 @@ Volume Manager.
%if !%{with devicemapper} && !%{with lockd}
extra_opts="
--enable-blkid_wiping
--enable-cmdlib
--enable-lvmpolld
--enable-realtime
--with-cache=internal
@@ -156,7 +142,6 @@ extra_opts="
%if %{with lockd}
extra_opts="
--enable-blkid_wiping
--enable-cmdlib
--enable-lvmpolld
--enable-realtime
--with-default-locking-dir=/run/lock/lvm
@@ -682,6 +667,8 @@ LVM commands use lvmlockd to coordinate access to shared storage.
Summary: LVM2 command line library
Group: System/Libraries
Conflicts: %{name} < %{version}
Obsoletes: liblvm2app2_2
Obsoletes: liblvm2cmd2_02
%description -n %{cmdlib}
The lvm2 command line library allows building programs that manage