From c3637fdf63f1a2e957cc29d6a47a24b382e1345c543cd972402d6523f1150544 Mon Sep 17 00:00:00 2001
From: heming zhao <heming.zhao@suse.com>
Date: Mon, 13 Mar 2023 09:38:52 +0000
Subject: [PATCH] Accepting request 1071087 from
 home:nicholasyang:branches:network:ha-clustering:Factory

replace %pretrans with %pre since zypper handles file conflicts

zypper adds `--force` argument to `rpm -U` so that %pretrans is not needed.

OBS-URL: https://build.opensuse.org/request/show/1071087
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=123
---
 drbd-utils.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drbd-utils.spec b/drbd-utils.spec
index c6ecf9f..5c0101e 100644
--- a/drbd-utils.spec
+++ b/drbd-utils.spec
@@ -147,7 +147,8 @@ rm -rf %{buildroot}%{libdir}/drbd/crm-*fence-peer.sh     # bsc#1204276
     ln -sf %{libdir}/drbd %{buildroot}/lib/drbd
 %endif
 
-%pretrans
+%pre
+%service_add_pre %{services}
 %if 0%{?suse_version} < 1550
 if [ ! -L /lib/drbd ] && [ -d /lib/drbd ]; then
     rm -rf /lib/drbd.rpmmoved
@@ -155,9 +156,6 @@ if [ ! -L /lib/drbd ] && [ -d /lib/drbd ]; then
 fi
 %endif
 
-%pre
-%service_add_pre %{services}
-
 %post
 %tmpfiles_create %{_tmpfilesdir}/drbd.conf
 %service_add_post %{services}