Accepting request 225770 from home:zhonglidong:branches:network:ha-clustering:Factory

fix bnc#866057 and 867767

OBS-URL: https://build.opensuse.org/request/show/225770
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=47

bnc#867767-add-version.patch

@@ -0,0 +1,6 @@
+Index: corosync-2.3.3/.tarball-version
+===================================================================
+--- /dev/null
++++ corosync-2.3.3/.tarball-version
+@@ -0,0 +1 @@
++2.3.3

corosync.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar 12 08:41:21 UTC 2014 - lzhong@suse.com
+
+- Add symlink rccorosync to /usr/sbin/service (bnc#866057) 
+
+-------------------------------------------------------------------
+Wed Mar 12 08:21:33 UTC 2014 - lzhong@suse.com
+
+- Fix corosync -v show UNKNOW (bnc#867767) 
+
 -------------------------------------------------------------------
 Tue Jan 21 07:48:22 UTC 2014 - xli@suse.com
 

corosync.spec

@@ -52,6 +52,7 @@ Source2:        baselibs.conf
 Patch1:         corosync-init-lockfile-path-error.patch
 Patch2:         corosync-cts-api-error.patch
 Patch3:         corosync-conf-example.patch
+Patch4:         bnc#867767-add-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. No, we do not
 # provide openais on purpose, the package has been deleted.
@@ -100,6 +101,7 @@ Requires:       libxslt
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 #%if 0%{?buildtrunk} == 1
@@ -161,6 +163,9 @@ install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buil
 #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
 ## tree fixup
 # drop static libs
 rm -f %{buildroot}%{_libdir}/*.a
@@ -227,6 +232,9 @@ fi
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
 %{_sbindir}/corosync-notifyd
+%if %{with_systemd}                                                                                                                                                     
+%{_sbindir}/rccorosync
+%endif
 %{_bindir}/corosync-blackbox
 %if %{with xmlconf}
 %{_bindir}/corosync-xmlproc