rpm/corosync
SHA256
1
0
Fork 0
forked from pool/corosync
Code Pull Requests Activity

Accepting request 509614 from home:BinLiu:branches:network:ha-clustering:Factory

Browse Source 
-  some upstream fixes for corosync(bsc#1048259) 
Added:
    bsc#1047860-add-version.patch
    0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch
    0008-main.c-add-option-to-set-priority.patch
    0009-totem-Propagate-totem-initialization-failure.patch
Removed:
    bnc#867767-add-version.patch
    0007-improve-corosync-keygen.patch(since this patch is not for corosync v2.x)
Modified:
    corosync.spec, add judgement whether /etc/sysconfig/corosycn* exist before remove these files

OBS-URL: https://build.opensuse.org/request/show/509614
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=94
This commit is contained in:
Bin Liu
2017-07-12 05:54:18 +00:00
committed by Git OBS Bridge
parent 1cb1ed57d7
commit 9b7f65cbfb
7 changed files with 535 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
corosync.spec
View File

@@ -52,7 +52,7 @@ Url: http://corosync.github.io/corosync/
Source0: %{name}-%{version}.tar.gz
Source2: baselibs.conf
Patch1: corosync-init-lockfile-path-error.patch
Patch2: bnc#867767-add-version.patch
Patch2: bsc#1047860-add-version.patch
Patch3: bnc#872651-stop-cluster.patch
Patch4: bnc#882449-corosync-conf-example.patch
Patch5: corosync-2.3.4-fix-bashisms.patch
@@ -67,7 +67,9 @@ Patch13: 0003-totemrrp-Fix-situation-when-all-rings-are-faulty.patch
Patch14: 0004-main-Display-reason-why-cluster-cannot-be-formed.patch
Patch15: 0005-votequorum-Report-errors-from-votequorum_exec_send_r.patch
Patch16: 0006-coroapi-Use-size_t-for-private_data_size.patch
Patch17: 0007-improve-corosync-keygen.patch
Patch17: 0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch
Patch18: 0008-main.c-add-option-to-set-priority.patch
Patch19: 0009-totem-Propagate-totem-initialization-failure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# openais is indeed gone and should be uninstalled. Yes, we do not
@@ -144,6 +146,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%build
%if %{with_runautogen}
@@ -291,7 +295,9 @@ fi
%endif
%postun
rm /etc/sysconfig/corosync
if [ -f /etc/sysconfig/corosync ]; then
rm /etc/sysconfig/corosync
fi
%if %{with_systemd} && 0%{?systemd_postun:1}
%systemd_postun
%endif
@@ -499,8 +505,8 @@ NSS certificates and an init script.
%if %{sles_version} > 0
ln -s /run/corosync-qdevice /var/run/
%endif
%if %{with_systemd} && 0%{?systemd_post:1}
%systemd_post corosync-qdevice.service
%if %{with_systemd}
%service_add_post corosync-qdevice.service
%endif
%preun -n corosync-qdevice
@@ -517,11 +523,12 @@ unlink /var/run/corosync-qdevice
%endif
%postun -n corosync-qdevice
rm /etc/sysconfig/corosync-qdevice
if [ -f /etc/sysconfig/corosync-qdevice ]; then
rm /etc/sysconfig/corosync-qdevice
fi
%if %{with_systemd} && 0%{?systemd_postun:1}
%systemd_postun
%endif
#rm /etc/sysconfig/corosync-qdevice
%files -n corosync-qdevice
%defattr(-,root,root,-)
@@ -582,8 +589,8 @@ exit 0
ln -s /run/corosync-qnetd /var/run/
%endif
%{fillup_and_insserv -n corosync-qnetd}
%if %{with_systemd} && 0%{?systemd_post:1}
%systemd_post corosync-qnetd.service
%if %{with_systemd}
%service_add_post corosync-qnetd.service
%endif
%preun -n corosync-qnetd
@@ -600,11 +607,12 @@ unlink /var/run/corosync-qnetd
%endif
%postun -n corosync-qnetd
rm /etc/sysconfig/corosync-qnetd
if [ -f /etc/sysconfig/corosync-qnetd ];then
rm /etc/sysconfig/corosync-qnetd
fi
%if %{with_systemd} && 0%{?systemd_postun:1}
%systemd_postun
%endif
#rm /etc/sysconfig/corosync-qnetd
%files -n corosync-qnetd
%defattr(-,root,root,-)