pool/corosync
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
3) remove  "||:" from tpmfiles_create if tmpfiles_create not defined, and add to the line when it is called.

OBS-URL: https://build.opensuse.org/request/show/519251
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=104
This commit is contained in:
Bin Liu 2017-08-29 05:55:21 +00:00 committed by Git OBS Bridge
parent adcd55847e
commit 791e2ffa6c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
corosync.changes
View File

@ -19,6 +19,7 @@ Thu Aug 3 02:49:21 UTC 2017 - bliu@suse.com
Modified:corosync.spec Modified:corosync.spec
1) as in openSUSE:factory, there are %define, but bcond_with coudld be toggled by osc command , change %define to %bcond_with and %bcond_without 1) as in openSUSE:factory, there are %define, but bcond_with coudld be toggled by osc command , change %define to %bcond_with and %bcond_without
2) change service_del_postun to service_del_preun, since service_del_postun is not a right macro 2) change service_del_postun to service_del_preun, since service_del_postun is not a right macro
3) remove "||:" from tpmfiles_create if tmpfiles_create not defined, and add to the line when it is called.
------------------------------------------------------------------- -------------------------------------------------------------------

6
corosync.spec
View File

@ -33,7 +33,7 @@
%bcond_without qnetd %bcond_without qnetd
%if !%{defined tmpfiles_create} %if !%{defined tmpfiles_create}
%define tmpfiles_create systemd-tmpfiles --create ||: %define tmpfiles_create systemd-tmpfiles --create
%endif %endif
%if 0%{?sles_version} == 12 %if 0%{?sles_version} == 12
@ -275,7 +275,7 @@ APIs and libraries, default configuration files, and an init script.
%service_add_pre corosync.service corosync-notifyd.service %service_add_pre corosync.service corosync-notifyd.service
%post %post
%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd %tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd ||:
%{fillup_and_insserv -n corosync} %{fillup_and_insserv -n corosync}
%service_add_post corosync.service corosync-notifyd.service %service_add_post corosync.service corosync-notifyd.service
@ -551,7 +551,7 @@ getent passwd coroqnetd >/dev/null || useradd -r -g coroqnetd -u 701 -s /sbin/no
exit 0 exit 0
%post -n corosync-qnetd %post -n corosync-qnetd
%tmpfiles_create /usr/lib/tmpfiles.d/corosync-qnetd.conf %tmpfiles_create /usr/lib/tmpfiles.d/corosync-qnetd.conf ||:
%if %{sles_version} > 0 %if %{sles_version} > 0
ln -s /run/corosync-qnetd /var/run/ ln -s /run/corosync-qnetd /var/run/
%endif %endif