From 580462a303f4554e2a971124f8437c45254eea2715ac6996b0f25438ce282086 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 26 Mar 2021 08:45:39 +0000 Subject: [PATCH] Accepting request 878023 from home:dimstar:Factory - Drop the script-dependencies on /sbin/chkconfig: deprecated - Drop the main package's dependency on /usr/sbin/adduser: the main package does not call this in the pre scripts. - Change Requires(pre): shadow in corosync-qdevice to Requires(pre): /usr/sbin/adduser (support alternartive implementations). - Use %systemd_ordering for the various, too strict, systemd script dependencies. OBS-URL: https://build.opensuse.org/request/show/878023 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=177 --- corosync.changes | 12 ++++++++++++ corosync.spec | 19 +++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/corosync.changes b/corosync.changes index cf63ea5..b803f8f 100644 --- a/corosync.changes +++ b/corosync.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Mar 9 13:47:45 UTC 2021 - Dominique Leuenberger + +- Drop the script-dependencies on /sbin/chkconfig: deprecated +- Drop the main package's dependency on /usr/sbin/adduser: the main + package does not call this in the pre scripts. +- Change Requires(pre): shadow in corosync-qdevice to + Requires(pre): /usr/sbin/adduser (support alternartive + implementations). +- Use %systemd_ordering for the various, too strict, systemd script + dependencies. + ------------------------------------------------------------------- Tue Oct 27 14:25:29 UTC 2020 - Aleksei Burlakov diff --git a/corosync.spec b/corosync.spec index 0ef95c2..af7e46a 100644 --- a/corosync.spec +++ b/corosync.spec @@ -1,7 +1,7 @@ # # spec file for package corosync # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -80,9 +80,6 @@ Requires: libquorum5 = %{version}-%{release} Requires: libsam4 = %{version}-%{release} Requires: libtotem_pg5 = %{version}-%{release} Requires: libvotequorum8 = %{version}-%{release} -Requires(pre): /usr/sbin/useradd -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig Conflicts: openais <= 0.89, openais-devel <= 0.89 # Build bits @@ -111,9 +108,7 @@ BuildRequires: dbus-1-devel %endif %if %{with systemd} BuildRequires: pkgconfig(systemd) -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{systemd_ordering} %endif %if %{with xmlconf} Requires: libxslt @@ -571,9 +566,7 @@ Requires: corosync Requires: mozilla-nss-tools %if %{with systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{systemd_ordering} %endif %description -n corosync-qdevice @@ -641,12 +634,10 @@ fi Summary: The Corosync Cluster Engine Qdevice Network Daemon Group: System/Base Requires: mozilla-nss-tools -Requires(pre): shadow +Requires(pre): /usr/sbin/useradd %if %{with systemd} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{systemd_ordering} %endif %description -n corosync-qnetd