From 433e227904c24b760c2b0dec749b2032ce7e392ce4dc69055327ecfcaaca8c14 Mon Sep 17 00:00:00 2001
From: nick wang <nwang@suse.com>
Date: Mon, 1 Nov 2021 03:25:40 +0000
Subject: [PATCH 1/2] Accepting request 928445 from
 home:wanghaisu:branches:network:ha-clustering:Factory

Use macro for the long services list.

OBS-URL: https://build.opensuse.org/request/show/928445
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=111
---
 drbd-utils.spec | 41 +++++------------------------------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/drbd-utils.spec b/drbd-utils.spec
index fdee60f..db35766 100644
--- a/drbd-utils.spec
+++ b/drbd-utils.spec
@@ -16,6 +16,7 @@
 #
 
 
+%define services drbd.service drbd-lvchange@.service drbd-promote@.service drbd-reconfigure-suspend-or-error@.service drbd-services@.target drbd-wait-promotable@.service drbd@.service drbd@.target ocf.ra@.service
 %if !0%{?usrmerged}
 %define sbindir /sbin
 %define libdir  /lib
@@ -137,27 +138,11 @@ rm -rf %{buildroot}%{_sysconfdir}/xen
 %endif
 
 %pre
-%service_add_pre drbd.service
-%service_add_pre drbd-lvchange@.service
-%service_add_pre drbd-promote@.service
-%service_add_pre drbd-reconfigure-suspend-or-error@.service
-%service_add_pre drbd-services@.target
-%service_add_pre drbd-wait-promotable@.service
-%service_add_pre drbd@.service
-%service_add_pre drbd@.target
-%service_add_pre ocf.ra@.service
+%service_add_pre %{services}
 
 %post
 %tmpfiles_create %{_tmpfilesdir}/drbd.conf
-%service_add_post drbd.service
-%service_add_post drbd-lvchange@.service
-%service_add_post drbd-promote@.service
-%service_add_post drbd-reconfigure-suspend-or-error@.service
-%service_add_post drbd-services@.target
-%service_add_post drbd-wait-promotable@.service
-%service_add_post drbd@.service
-%service_add_post drbd@.target
-%service_add_post ocf.ra@.service
+%service_add_post %{services}
 
 #May also overlap the $MAN_LINK in documentation/v9/Makefile.in
 for f in drbd drbdadm drbdmeta drbdsetup; do
@@ -172,26 +157,10 @@ ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
 %endif
 
 %preun
-%service_del_preun drbd.service
-%service_del_preun drbd-lvchange@.service
-%service_del_preun drbd-promote@.service
-%service_del_preun drbd-reconfigure-suspend-or-error@.service
-%service_del_preun drbd-services@.target
-%service_del_preun drbd-wait-promotable@.service
-%service_del_preun drbd@.service
-%service_del_preun drbd@.target
-%service_del_preun ocf.ra@.service
+%service_del_preun %{services}
 
 %postun
-%service_del_postun drbd.service
-%service_del_postun drbd-lvchange@.service
-%service_del_postun drbd-promote@.service
-%service_del_postun drbd-reconfigure-suspend-or-error@.service
-%service_del_postun drbd-services@.target
-%service_del_postun drbd-wait-promotable@.service
-%service_del_postun drbd@.service
-%service_del_postun drbd@.target
-%service_del_postun ocf.ra@.service
+%service_del_postun %{services}
 
 %files -n drbd-utils
 %config(noreplace) %{_sysconfdir}/drbd.conf

From 25202211917aa1bfaccf21946bca58a76ebe0ea602b5f5de1af4b258b87b3881 Mon Sep 17 00:00:00 2001
From: nick wang <nwang@suse.com>
Date: Fri, 14 Jan 2022 02:17:16 +0000
Subject: [PATCH 2/2] Accepting request 946246 from
 home:olh:branches:network:ha-clustering:Factory

- remove instance units from post scripts, they can not be reloaded

OBS-URL: https://build.opensuse.org/request/show/946246
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=112
---
 drbd-utils.changes | 5 +++++
 drbd-utils.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drbd-utils.changes b/drbd-utils.changes
index 20cccc8..f8509be 100644
--- a/drbd-utils.changes
+++ b/drbd-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 10 16:16:16 UTC 2022 - olaf@aepfle.de
+
+- remove instance units from post scripts, they can not be reloaded
+
 -------------------------------------------------------------------
 Mon Oct 11 09:43:25 UTC 2021 - nick wang <nwang@suse.com>
 
diff --git a/drbd-utils.spec b/drbd-utils.spec
index db35766..b41f203 100644
--- a/drbd-utils.spec
+++ b/drbd-utils.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define services drbd.service drbd-lvchange@.service drbd-promote@.service drbd-reconfigure-suspend-or-error@.service drbd-services@.target drbd-wait-promotable@.service drbd@.service drbd@.target ocf.ra@.service
+%define services drbd.service
 %if !0%{?usrmerged}
 %define sbindir /sbin
 %define libdir  /lib