From 0912ac22cba2f53876475fc0e2e4ec2ea6abb86d2f5ce53a9abce90328cd01e4 Mon Sep 17 00:00:00 2001
From: xia li <xli@suse.com>
Date: Fri, 11 Apr 2014 08:27:04 +0000
Subject: [PATCH] Accepting request 229688 from
 home:zhonglidong:branches:network:ha-clustering:Factory

bnc#872122 and bnc#872651

OBS-URL: https://build.opensuse.org/request/show/229688
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=50
---
 bnc#872651-stop-cluster.patch | 12 ++++++++++++
 corosync.changes              |  8 +++++++-
 corosync.spec                 | 18 +++++++-----------
 3 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 bnc#872651-stop-cluster.patch

diff --git a/bnc#872651-stop-cluster.patch b/bnc#872651-stop-cluster.patch
new file mode 100644
index 0000000..a0912ef
--- /dev/null
+++ b/bnc#872651-stop-cluster.patch
@@ -0,0 +1,12 @@
+Index: corosync-2.3.3/init/corosync.service.in
+===================================================================
+--- corosync-2.3.3.orig/init/corosync.service.in
++++ corosync-2.3.3/init/corosync.service.in
+@@ -3,6 +3,7 @@ Description=Corosync Cluster Engine
+ ConditionKernelCommandLine=!nocluster
+ Requires=network-online.target
+ After=network-online.target
++StopWhenUnneeded=yes
+ 
+ [Service]
+ ExecStart=@INITWRAPPERSDIR@/corosync start
diff --git a/corosync.changes b/corosync.changes
index 87f28d3..32a4760 100644
--- a/corosync.changes
+++ b/corosync.changes
@@ -1,9 +1,15 @@
+Fri Apr 11 06:50:17 UTC 2014 - lzhong@suse.com
+
+- Fix `systemctl stop pacemaker` leaves corosync running
+   + bnc#872651-stop-cluster.patch 
+- Ensure that libopenais3 is removed on update of corosync(bnc#872122)
+
 -------------------------------------------------------------------
 Wed Mar 12 08:41:21 UTC 2014 - lzhong@suse.com
 
 - Modify spec file:add symlink rccorosync to /usr/sbin/service (bnc#866057) 
 - Fix corosync -v show UNKNOW (bnc#867767) 
-	+ bnc#867767-add-version.patch
+   + bnc#867767-add-version.patch
 
 -------------------------------------------------------------------
 Tue Jan 21 07:48:22 UTC 2014 - xli@suse.com
diff --git a/corosync.spec b/corosync.spec
index b53393c..700b9b8 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -53,8 +53,9 @@ Patch1:         corosync-init-lockfile-path-error.patch
 Patch2:         corosync-cts-api-error.patch
 Patch3:         corosync-conf-example.patch
 Patch4:         bnc#867767-add-version.patch
+Patch5:         bnc#872651-stop-cluster.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# openais is indeed gone and should be uninstalled. No, we do not
+# openais is indeed gone and should be uninstalled. Yes, we do not
 # provide openais on purpose, the package has been deleted.
 Obsoletes:      openais
 Conflicts:      openais
@@ -63,7 +64,6 @@ Requires:       libcorosync4 = %{version}-%{release}
 #Requires(pre): /usr/sbin/useradd
 #Requires(post): /sbin/chkconfig
 #Requires(preun): /sbin/chkconfig
-#Conflicts:      openais <= 0.89, openais-devel <= 0.89
 
 BuildRequires:  libqb-devel
 BuildRequires:  mozilla-nss
@@ -102,6 +102,7 @@ Requires:       libxslt
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 #%if 0%{?buildtrunk} == 1
@@ -154,15 +155,6 @@ make install DESTDIR=%{buildroot}
 mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
 install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
 %endif
-# removed to discourage use of init.d/corosync (openais should be
-# used instead)
-#%if 0%{?suse_version}
-#ln -sf ../../etc/init.d/corosync %{buildroot}%{_sbindir}/rccorosync
-#%endif
-#rm -f %{buildroot}%{_initrddir}/corosync
-#rm -f %{buildroot}%{_initrddir}/corosync-notifyd
-#rm -f %{buildroot}/usr/sbin/corosync-notifyd
-#rm -f %{buildroot}/usr/share/man/man8/corosync-notifyd.8
 %if %{with_systemd}
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccorosync
 %endif
@@ -311,6 +303,10 @@ This package contains corosync test agents.
 %package -n libcorosync4
 Summary:        The Corosync Cluster Engine Libraries
 Group:          Productivity/Clustering/HA
+# openais is indeed gone and should be uninstalled. Yes, we do not
+# provide openais on purpose, the package has been deleted.
+Obsoletes:      libopenais3
+Conflicts:      libopenais3
 #Requires:       %{name} = %{version}-%{release}
 
 %description -n libcorosync4