Accepting request 630677 from home:ganghe:branches:openSUSE:Factory

- Update to LVM2.2.02.180
- Drop the upstream patches
 - fate-323203_lvmlockd-add-lockopt-values-for-skipping-selected-lo.patch
 - lvm2-69-dm-lvm-metad.rules-explicit-pvscan-rule.patch
 - lvm2-69-dm-lvm-metad.rules-set-systemd-vars-on-chang.patch
 - bug-1095960_dev_io-no-discard-in-testmode.patch
- Refresh patches
 + bsc1080299-detect-clvm-properly.patch
 + bug-950089_test-fix-lvm2-testsuite-build-error.patch
- Fix cmirrord LV creation/activation failure (bsc#1091863)
- Fix that pvmove does not work (bsc#1080299)
- Fix package name for modprobe during build (bsc#1102668)
- Fix building error due to the script interpreter
 + tests-specify-python3-as-the-script-interpreter.patch
- Update to LVM2.2.02.180
- Drop the upstream patches
 - fate-323203_lvmlockd-add-lockopt-values-for-skipping-selected-lo.patch
 - lvm2-69-dm-lvm-metad.rules-explicit-pvscan-rule.patch
 - lvm2-69-dm-lvm-metad.rules-set-systemd-vars-on-chang.patch
 - bug-1095960_dev_io-no-discard-in-testmode.patch
- Refresh patches
 + bsc1080299-detect-clvm-properly.patch
 + bug-950089_test-fix-lvm2-testsuite-build-error.patch
- Fix cmirrord LV creation/activation failure (bsc#1091863)
- Fix that pvmove does not work (bsc#1080299)
- Fix package name for modprobe during build (bsc#1102668)
- Fix building error due to the script interpreter
 + tests-specify-python3-as-the-script-interpreter.patch
- Update to LVM2.2.02.180
- Drop the upstream patches
 - fate-323203_lvmlockd-add-lockopt-values-for-skipping-selected-lo.patch
 - lvm2-69-dm-lvm-metad.rules-explicit-pvscan-rule.patch
 - lvm2-69-dm-lvm-metad.rules-set-systemd-vars-on-chang.patch
 - bug-1095960_dev_io-no-discard-in-testmode.patch
- Refresh patches
 + bsc1080299-detect-clvm-properly.patch
 + bug-950089_test-fix-lvm2-testsuite-build-error.patch
- Fix cmirrord LV creation/activation failure (bsc#1091863)
- Fix that pvmove does not work (bsc#1080299)
- Fix package name for modprobe during build (bsc#1102668)
- Fix building error due to the script interpreter
 + tests-specify-python3-as-the-script-interpreter.patch

OBS-URL: https://build.opensuse.org/request/show/630677
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=227

lvm2.spec

@@ -16,13 +16,14 @@
 #
 
 
+%define _unpackaged_files_terminate_build 0
 %define _udevdir %(pkg-config --variable=udevdir udev)
 %define applib liblvm2app2_2
 %define cmdlib liblvm2cmd2_02
 
 ### COMMON-DEF-BEGIN ###
-%define lvm2_version              2.02.177
-%define device_mapper_version     1.02.146
+%define lvm2_version              2.02.180
+%define device_mapper_version     1.02.149
 %define thin_provisioning_version 0.7.0
 ### COMMON-DEF-END ###
 
@@ -38,9 +39,10 @@ Source1:        lvm.conf
 Source42:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz.asc
 BuildRequires:  gcc-c++
 BuildRequires:  libaio-devel
+BuildRequires:  libcorosync-devel
 BuildRequires:  libselinux-devel
 # To detect modprobe during build
-BuildRequires:  modutils
+BuildRequires:  kmod-compat
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  thin-provisioning-tools >= %{thin_provisioning_version}
@@ -58,8 +60,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
-Patch0001:      fate-323203_lvmlockd-add-lockopt-values-for-skipping-selected-lo.patch
-Patch0002:      bug-1095960_dev_io-no-discard-in-testmode.patch
 
 # SUSE patches: 1000+ for LVM
 # Never upstream
@@ -71,14 +71,13 @@ Patch1005:      bsc1080299-detect-clvm-properly.patch
 
 #SUSE patches 2000+ for device mapper, udev rules
 Patch2001:      bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
-Patch2002:      lvm2-69-dm-lvm-metad.rules-explicit-pvscan-rule.patch
-Patch2003:      lvm2-69-dm-lvm-metad.rules-set-systemd-vars-on-chang.patch
 ### COMMON-PATCH-END ###
 
 # 3000+ for test code
 Patch3001:      bug-950089_test-fix-lvm2-testsuite-build-error.patch
 Patch3002:      bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
 Patch3003:      bug-1072624_test-lvmetad_dump-always-timed-out-when-using-nc.patch
+Patch3004:      tests-specify-python3-as-the-script-interpreter.patch
 
 # patches specif for lvm2.spec
 Patch4001:      bug-1037309_Makefile-skip-compliling-daemons-lvmlockd-directory.patch
@@ -91,20 +90,17 @@ Volume Manager.
 %setup -q -n LVM2.%{version}
 ### COMMON-PREP-BEGIN ###
 %patch1001 -p1
-%patch0001 -p1
-%patch0002 -p1
 %patch1002 -p1
 %patch1003 -p1
 %patch1004 -p1
 %patch1005 -p1
 %patch2001 -p1
-%patch2002 -p1
-%patch2003 -p1
 ### COMMON-PREP-END ###
 
 %patch3001 -p1
 %patch3002 -p1
 %patch3003 -p1
+%patch3004 -p1
 %patch4001 -p1
 
 %build
@@ -119,6 +115,7 @@ extra_opts="
     --with-default-locking-dir=/run/lock/lvm
     --with-default-pid-dir=/run
     --with-default-run-dir=/run/lvm
+    --enable-cmirrord
 "
 
 ### COMMON-CONFIG-BEGIN ###