Hello community,
here is the log from the commit of package corosync for openSUSE:Factory
checked in at 2014-04-15 07:35:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/corosync (Old)
and /work/SRC/openSUSE:Factory/.corosync.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "corosync"
Changes:
--------
--- /work/SRC/openSUSE:Factory/corosync/corosync.changes 2014-03-18
16:21:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes 2014-04-15
07:35:24.000000000 +0200
@@ -0,0 +1,6 @@
+Fri Apr 11 06:50:17 UTC 2014 - lzh...@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)
+
New:
----
bnc#872651-stop-cluster.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ corosync.spec ++++++
--- /var/tmp/diff_new_pack.J7TX4w/_old 2014-04-15 07:35:25.000000000 +0200
+++ /var/tmp/diff_new_pack.J7TX4w/_new 2014-04-15 07:35:25.000000000 +0200
@@ -53,8 +53,9 @@
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(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 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
#%if 0%{?buildtrunk} == 1
@@ -154,15 +155,6 @@
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,9 @@
%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
#Requires: %{name} = %{version}-%{release}
%description -n libcorosync4
++++++ bnc#872651-stop-cluster.patch ++++++
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
