Accepting request 504374 from home:ZRen:branches:Base:System

- Fix test failures about read ahead issue, see bsc#1043040 
  + bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
- Reorder the patches to put them into the right groups

- Don't package dynamic directories in /run

- Fix test failures about read ahead issue, see bsc#1043040 
  + bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
- Reorder the patches to put them into the right groups

- Don't package dynamic directories in /run

- Fix test failures about read ahead issue, see bsc#1043040 
  + bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
- Reorder the patches to put them into the right groups

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

device-mapper.spec

@@ -47,7 +47,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
-# SUSE patches: 1000+ for LVM, 2000+ for device mapper
+
+# SUSE patches: 1000+ for LVM
 # Never upstream
 Patch1001:      cmirrord_remove_date_time_from_compilation.patch
 #fate#309425
@@ -64,16 +65,22 @@ Patch1007:      cluster_support_mirrord_log.diff
 Patch1008:      lvconvert-cluster-mirrored-disk-failed.patch
 # no reference
 Patch1009:      pvmove_support_clustered_vg.diff
+#FATE#318413
+Patch1010:      fsadm-add-support-for-btrfs.patch
+#bnc#960744
+Patch1011:      pvcreate-enhance-the-error-message.patch
 #bnc873538
-Patch1010:      fix-closedown-before-thread-finish.patch
+Patch1012:      fix-closedown-before-thread-finish.patch
 #bnc#870824
-Patch1011:      use-mirrortype-asdefault-whenclvmdrunning.patch
+Patch1013:      use-mirrortype-asdefault-whenclvmdrunning.patch
 # no reference
-Patch1012:      version-plugins-in-libdir.patch
+Patch1014:      version-plugins-in-libdir.patch
 #bsc#935623
-Patch1013:      dmeventd-fix-dso-name-wrong-compare.patch
+Patch1015:      dmeventd-fix-dso-name-wrong-compare.patch
 #bsc#960044
-Patch1014:      lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
+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
@@ -84,22 +91,22 @@ Patch2002:      device-mapper-link.patch
 Patch2003:      udev_rules-update.diff
 #bnc#875233
 Patch2004:      udev-Check-for-DM_NR_VALID_PATHS.patch
-#FATE#318413
-Patch2005:      fsadm-add-support-for-btrfs.patch
 #bnc909358
-Patch2006:      Import-ID_FS_XXX-variables-bnc909358.patch
+Patch2005:      Import-ID_FS_XXX-variables-bnc909358.patch
 #bsc#932300
-Patch2007:      10-dm.rules-Reset-state-variable-for-spurious-events.patch
+Patch2006:      10-dm.rules-Reset-state-variable-for-spurious-events.patch
 #bsc#940298
-Patch2008:      libdm-iface-not-output-error-message-inside-retry-loop.patch
-#bnc#960744
-Patch2009:      pvcreate-enhance-the-error-message.patch
+Patch2007:      libdm-iface-not-output-error-message-inside-retry-loop.patch
 #bnc#990538,bnc#986734
-Patch2010:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
-#bnc#950089
-Patch2011:      lvm2-testsuite.patch
+Patch2008:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
 #bsc#1012973
-Patch2012:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
+Patch2009:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
+
+# 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 ###
 
 %description
@@ -122,6 +129,8 @@ Programs and man pages for configuring and using the device mapper.
 %patch1012 -p1
 %patch1013 -p1
 %patch1014 -p1
+%patch1015 -p1
+%patch1016 -p1
 %patch2000 -p1
 %patch2001 -p1
 %patch2002 -p1
@@ -132,9 +141,8 @@ Programs and man pages for configuring and using the device mapper.
 %patch2007 -p1
 %patch2008 -p1
 %patch2009 -p1
-%patch2010 -p1
-%patch2011 -p1
-%patch2012 -p1
+%patch3001 -p1
+%patch3002 -p1
 ### COMMON-PREP-END ###
 
 %build