SHA256
1
0
forked from pool/lvm2

Accepting request 508098 from network:ha-clustering:Unstable

- Update to LVM2.2.02.172
- Cleanup spec file, and refresh patches

- Fix zypper update issue with device-mapper package, see bsc#1045396
- Update to LVM2.2.02.172
- Cleanup spec file, and refresh patches

- Fix zypper update issue with device-mapper package, see bsc#1045396
- Update to LVM2.2.02.172
- Cleanup spec file, and refresh patches

- Fix zypper update issue with device-mapper package, see bsc#1045396

OBS-URL: https://build.opensuse.org/request/show/508098
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=194
This commit is contained in:
Eric ren
2017-07-04 12:31:34 +00:00
committed by Git OBS Bridge
parent ca0867bdb4
commit 39212502cd
15 changed files with 156 additions and 254 deletions

View File

@@ -19,11 +19,13 @@
%define _udevdir %(pkg-config --variable=udevdir udev)
%define applib liblvm2app2_2
%define cmdlib liblvm2cmd2_02
### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.170
%define device_mapper_version 1.02.139
%define thin_provisioning_version 0.5.6
%define lvm2_version 2.02.172
%define device_mapper_version 1.02.141
%define thin_provisioning_version 0.7.0
### COMMON-DEF-END ###
Name: lvm2
Version: %{lvm2_version}
Release: 0
@@ -53,9 +55,9 @@ Requires(postun): coreutils
Provides: lvm = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
### COMMON-PATCH-BEGIN ###
# Upstream patches
Patch0001: bug-1033691_tests-missed-to-export-lvm-binary-for-fsadm.patch
# SUSE patches: 1000+ for LVM
# Never upstream
@@ -91,35 +93,33 @@ Patch1016: lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
#SUSE patches 2000+ for device mapper, udev rules
#bsc#479104,bnc#707253
Patch2000: device-mapper-dmsetup-export.patch
# no reference
Patch2001: device-mapper-gcc-warnings.patch
#bsc#724578
Patch2002: device-mapper-link.patch
Patch2001: device-mapper-dmsetup-export.patch
#bnc#78902,bnc#789019,bnc#789020
Patch2003: udev_rules-update.diff
Patch2002: udev_rules-update.diff
#bnc#875233
Patch2004: udev-Check-for-DM_NR_VALID_PATHS.patch
Patch2003: udev-Check-for-DM_NR_VALID_PATHS.patch
#bnc909358
Patch2005: Import-ID_FS_XXX-variables-bnc909358.patch
Patch2004: Import-ID_FS_XXX-variables-bnc909358.patch
#bsc#932300
Patch2006: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
Patch2005: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
#bsc#940298
Patch2007: libdm-iface-not-output-error-message-inside-retry-loop.patch
Patch2006: libdm-iface-not-output-error-message-inside-retry-loop.patch
#bnc#990538,bnc#986734
Patch2008: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
Patch2007: 69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
#bsc#1012973
Patch2009: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
Patch2008: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
# no reference
Patch2009: device-mapper-gcc-warnings.patch
### COMMON-PATCH-END ###
# 3000+ for test code
#bnc#950089
Patch3001: lvm2-testsuite.patch
#bsc#1043040
Patch3002: bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
### COMMON-PATCH-END ###
#bsc#1037309
Patch4001: Makefile-skip-compliling-daemons-lvmlockd-directory.patch
Patch4001: bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch
%description
Programs and man pages for configuring and using the LVM2 Logical
@@ -128,7 +128,6 @@ Volume Manager.
%prep
%setup -q -n LVM2.%{version}
### COMMON-PREP-BEGIN ###
%patch0001 -p1
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
@@ -145,7 +144,6 @@ Volume Manager.
%patch1014 -p1
%patch1015 -p1
%patch1016 -p1
%patch2000 -p1
%patch2001 -p1
%patch2002 -p1
%patch2003 -p1
@@ -155,10 +153,10 @@ Volume Manager.
%patch2007 -p1
%patch2008 -p1
%patch2009 -p1
%patch3001 -p1
%patch3002 -p1
### COMMON-PREP-END ###
%patch3001 -p1
%patch3002 -p1
%patch4001 -p1
%build
@@ -233,25 +231,25 @@ ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmpolld
rm %{buildroot}%{_sbindir}/dmsetup
rm %{buildroot}%{_sbindir}/dmeventd
rm %{buildroot}%{_sbindir}/dmstats
rm %{buildroot}%{_mandir}/man8/dmstats.8
rm %{buildroot}%{_mandir}/man8/dmsetup.8
rm %{buildroot}%{_mandir}/man8/dmeventd.8
rm %{buildroot}%{_udevrulesdir}/10-dm.rules
rm %{buildroot}%{_udevrulesdir}/13-dm-disk.rules
rm %{buildroot}%{_udevrulesdir}/95-dm-notify.rules
rm %{buildroot}%{_unitdir}/dm-event.socket
rm %{buildroot}%{_unitdir}/dm-event.service
# See bsc#1037309 for more info
rm %{buildroot}%{_unitdir}/lvm2-lvmlockd.service
rm %{buildroot}%{_unitdir}/lvm2-lvmlocking.service
rm %{buildroot}%{_includedir}/libdevmapper*.h
rm %{buildroot}%{_libdir}/libdevmapper.so.1.03
rm %{buildroot}%{_libdir}/libdevmapper-event.so.1.03
rm %{buildroot}%{_libdir}/libdevmapper.so
rm %{buildroot}%{_libdir}/libdevmapper-event.so
rm %{buildroot}%{_includedir}/libdevmapper*.h
rm %{buildroot}%{_libdir}/pkgconfig/devmapper*.pc
# See bsc#1037309 for more info
rm %{buildroot}%{_unitdir}/lvm2-lvmlockd.service
rm %{buildroot}%{_unitdir}/lvm2-lvmlocking.service
rm %{buildroot}%{_mandir}/man8/lvmlockctl.8
rm %{buildroot}%{_mandir}/man8/lvmlockd.8
rm %{buildroot}%{_mandir}/man8/dmstats.8
rm %{buildroot}%{_mandir}/man8/dmsetup.8
rm %{buildroot}%{_mandir}/man8/dmeventd.8
# compat symlinks in /sbin remove with Leap 43
mkdir -p %{buildroot}/sbin