Accepting request 478914 from home:ganghe:branches:network:ha-clustering:Factory

Upgrade ocfs2-tools to v1.8.5

OBS-URL: https://build.opensuse.org/request/show/478914
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=94

ocfs2-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           ocfs2-tools
-Version:        1.8.4
+Version:        1.8.5
 Release:        0
 Summary:        Oracle Cluster File System 2 Core Tools
 License:        GPL-2.0+
@@ -27,6 +27,8 @@ Source:         ocfs2-tools-%{version}.tar.gz
 Source1:        o2cb.ocf
 Source2:        reflink.tar.bz2
 Patch001:       auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
+Patch101:       force-debug.patch
+Patch102:       extra-debug.patch
 Patch103:       debug-ocfs2_hb_ctl.patch
 Patch105:       bug-470741-debug_start_failures.patch
 Patch106:       ocfs2-devel.diff
@@ -36,15 +38,12 @@ Patch202:       fix-configure-check-libs.patch
 Patch204:       dont-use-var-lock-subsys.patch
 Patch205:       ocfs2-tools-kernel33.patch
 Patch206:       ocfs2-tools-resource.patch
-Patch301:       0001-libo2dlm-Close-file-description-after-use.patch
-Patch302:       0002-debugfs.ocfs2-Fix-a-bug-in-process_open_args.patch
-Patch401:       0003-o2cb-add-build-scripts-for-rhel7.patch
-Patch402:       0004-add-systemd-support.patch 
-Patch403:       0005-do-not-write-sysconfig-if-status-not-changed.patch
-Patch404:       0006-o2cb-mount-debugfs-when-load-config.patch
+Patch212:       bug-805764-ocfs2-controld.patch
+Patch213:       bnc804707-reduce-RR-priority.patch
+Patch225:       0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
+Patch228:       0007-Improve-error-message-if-DLM-service-is-unavailable.patch
 Patch405:       0007-vendor-Add-vendor-files-for-sles12.patch
 Patch406:       0008-ocfs2-tools-add-systemd-support-fix.patch
-Patch407:       0009-o2cb-fix-systemd-o2cb.service-failure.patch
 Patch501:       bnc#96864-ocfs2console-fix-starting-failure.patch
 
 BuildRequires:  autoconf
@@ -141,6 +140,8 @@ OCFS2 filesystem.
 %prep
 %setup -q -a 2
 %patch001 -p1
+%patch101 -p1
+%patch102 -p1
 %patch103 -p1
 %patch105 -p1
 %patch106 -p1
@@ -150,15 +151,12 @@ OCFS2 filesystem.
 %patch204 -p1
 %patch205 -p1
 %patch206 -p1
-%patch301 -p1
-%patch302 -p1
-%patch401 -p1
-%patch402 -p1
-%patch403 -p1
-%patch404 -p1
+%patch212 -p1
+%patch213 -p1
+%patch225 -p1
+%patch228 -p1
 %patch405 -p1
 %patch406 -p1
-%patch407 -p1
 %patch501 -p1
 
 %build