Accepting request 535958 from network:ha-clustering:Unstable

- Update to LVM2.2.02.175
- Use week dependency for lvm2-lockd on libdlm and sanlock
- Rename/refresh patches:
 - display-dm-name-for-lv-name.diff to fate-309425_display-dm-name-for-lv-name.patch
 - fsadm-add-support-for-btrfs.patch to fate-31841_fsadm-add-support-for-btrfs.patch
 - dmeventd-fix-dso-name-wrong-compare.patch to bug-935623_dmeventd-fix-dso-name-wrong-compare.patch
 - lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch to bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
 - simplify-special-case-for-md-in-69-dm-lvm-metadata.patch to bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch

- Drop resource agents for clvmd and cmirror (bsc#1058680)
  - clvmd.ocf
  - cmirrord.ocf
- Drop all patches for cmirror (bsc#1058661)
  - cluster_support_mirrord_log.diff
  - cmirrord_improvment_performance.patch
  - lvconvert-cluster-mirrored-disk-failed.patch
  - improve-mirror-legs-on-different-tag-pvs.patch
  - make-mirror-legs-on-different-tag-pvs.patch
  - use-mirrortype-asdefault-whenclvmdrunning.patch
  - lvm2-testsuite.patch

- Update to LVM2.2.02.175
- Use week dependency for lvm2-lockd on libdlm and sanlock
- Rename/refresh patches:
 - display-dm-name-for-lv-name.diff to fate-309425_display-dm-name-for-lv-name.patch
 - fsadm-add-support-for-btrfs.patch to fate-31841_fsadm-add-support-for-btrfs.patch
 - dmeventd-fix-dso-name-wrong-compare.patch to bug-935623_dmeventd-fix-dso-name-wrong-compare.patch
 - lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch to bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
 - simplify-special-case-for-md-in-69-dm-lvm-metadata.patch to bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch

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

lvm2.spec

@@ -21,8 +21,8 @@
 %define cmdlib liblvm2cmd2_02
 
 ### COMMON-DEF-BEGIN ###
-%define lvm2_version              2.02.173
-%define device_mapper_version     1.02.142
+%define lvm2_version              2.02.175
+%define device_mapper_version     1.02.144
 %define thin_provisioning_version 0.7.0
 ### COMMON-DEF-END ###
 
@@ -63,33 +63,22 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Never upstream
 Patch1001:      cmirrord_remove_date_time_from_compilation.patch
 #fate#309425
-Patch1002:      display-dm-name-for-lv-name.diff
-#fate#312248
-Patch1003:      make-mirror-legs-on-different-tag-pvs.patch
-Patch1004:      improve-mirror-legs-on-different-tag-pvs.patch
-#fate#315092
-Patch1005:      cmirrord_improvment_performance.patch
-#fate#314367
-Patch1006:      cluster_support_mirrord_log.diff
-Patch1007:      lvconvert-cluster-mirrored-disk-failed.patch
+Patch1002:      fate-309425_display-dm-name-for-lv-name.patch
 #FATE#318413
-Patch1008:      fsadm-add-support-for-btrfs.patch
-#bnc#870824
-Patch1009:      use-mirrortype-asdefault-whenclvmdrunning.patch
+Patch1003:      fate-31841_fsadm-add-support-for-btrfs.patch
 #bsc#935623
-Patch1010:      dmeventd-fix-dso-name-wrong-compare.patch
+Patch1004:      bug-935623_dmeventd-fix-dso-name-wrong-compare.patch
 #bsc#960044
-Patch1011:      lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
+Patch1005:      bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
 
 #SUSE patches 2000+ for device mapper, udev rules
 #bsc#1012973
-Patch2006:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
+Patch2006:      bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
 ### COMMON-PATCH-END ###
 
 # 3000+ for test code
-#bnc#950089
-Patch3001:      lvm2-testsuite.patch
 #bsc#1043040
+Patch3001:      bug-950089_test-fix-lvm2-testsuite-build-error.patch
 Patch3002:      bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
 
 #bsc#1037309
@@ -107,12 +96,6 @@ Volume Manager.
 %patch1003 -p1
 %patch1004 -p1
 %patch1005 -p1
-%patch1006 -p1
-%patch1007 -p1
-%patch1008 -p1
-%patch1009 -p1
-%patch1010 -p1
-%patch1011 -p1
 %patch2006 -p1
 ### COMMON-PREP-END ###
 
@@ -136,7 +119,8 @@ extra_opts="
 
 ### COMMON-CONFIG-BEGIN ###
 export PATH=$PATH:/sbin:%{_prefix}/sbin
-sed -ie "s/%{device_mapper_version}/1.03.01/g" VERSION_DM
+# Why this messy fix here? someone released a wrong version...
+sed -ie "s/1.02.*/1.03.01/g" VERSION_DM
 %configure \
     --enable-dmeventd \
     --enable-cmdlib \
@@ -201,8 +185,8 @@ rm %{buildroot}%{_unitdir}/dm-event.service
 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}%{_libdir}/libdevmapper.so
 rm %{buildroot}%{_libdir}/libdevmapper-event.so
 rm %{buildroot}%{_libdir}/pkgconfig/devmapper*.pc