diff --git a/corosync.changes b/corosync.changes index 8e75b22..7d7ff02 100644 --- a/corosync.changes +++ b/corosync.changes @@ -19,6 +19,7 @@ Thu Aug 3 02:49:21 UTC 2017 - bliu@suse.com 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 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. ------------------------------------------------------------------- diff --git a/corosync.spec b/corosync.spec index 33dffc0..dadd659 100644 --- a/corosync.spec +++ b/corosync.spec @@ -33,7 +33,7 @@ %bcond_without qnetd %if !%{defined tmpfiles_create} -%define tmpfiles_create systemd-tmpfiles --create ||: +%define tmpfiles_create systemd-tmpfiles --create %endif %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 %post -%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd +%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd ||: %{fillup_and_insserv -n corosync} %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 %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 ln -s /run/corosync-qnetd /var/run/ %endif