Accepting request 185215 from home:goldwynr:branches:network:ha-clustering:Factory

update to be compatible with corosync 2.3.x

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

ocfs2-tools.spec

@@ -29,7 +29,6 @@ Source2:        reflink.tar.bz2
 Patch101:       force-debug.patch
 Patch102:       extra-debug.patch
 Patch103:       debug-ocfs2_hb_ctl.patch
-Patch104:       ocfs2_controld-pacemaker.diff
 Patch105:       bug-470741-debug_start_failures.patch
 Patch106:       ocfs2-devel.diff
 Patch107:       reflink-no-syscall.patch
@@ -46,14 +45,17 @@ Patch212:       bug-805764-ocfs2-controld.patch
 Patch213:       bnc804707-reduce-RR-priority.patch
 Patch214:       use-symlink-in-udev-rules.patch
 Patch215:       ocfs2console-libraries-include-aio.patch
+Patch216:       0001-Remove-pacemaker-ais-stuff.patch
+Patch217:       0002-Add-corosync-cfg-to-get-configuration-information.patch
+Patch218:       0003-Hard-code-protocol-versions.patch
+Patch219:       0005-Add-cluster_name-and-stack-name.patch
+
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  libaio-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libcorosync-devel
 BuildRequires:  libdlm-devel
-BuildRequires:  libopenais-devel
-BuildRequires:  libpacemaker-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libz1
 BuildRequires:  python-devel
@@ -69,7 +71,6 @@ Requires:       e2fsprogs
 Requires:       glib2 >= 2.2.3
 Requires:       modutils
 Requires:       net-tools
-Requires:       openais
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} < 1120
 # There's no separate kmp for openSUSE 11.2
@@ -128,7 +129,6 @@ managing the file system.
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1
 %patch105 -p1
 %patch106 -p1
 %patch107 -p0
@@ -145,6 +145,10 @@ managing the file system.
 %patch213 -p1
 %patch214 -p1
 %patch215 -p1
+%patch216 -p1
+%patch217 -p1
+%patch218 -p1
+%patch219 -p1
 
 %build
 export PROJECT="ocfs2-tools"