From 0d70d475e9153bb2c95f8643c20195ae4108cb78416c3a5ca0353c3b391db56a Mon Sep 17 00:00:00 2001
From: heming zhao <heming.zhao@suse.com>
Date: Wed, 21 Sep 2022 23:54:36 +0000
Subject: [PATCH] Accepting request 1005208 from
 home:zzhou:branches:network:ha-clustering:Factory

drbd-utils.spec force _localstatedir to use /var/lib in runtime (bsc#1203220)

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

diff --git a/drbd-utils.changes b/drbd-utils.changes
index 4a67f22..81b4a13 100644
--- a/drbd-utils.changes
+++ b/drbd-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 21 13:11:34 UTC 2022 - Roger Zhou <zzhou@suse.com>
+
+- drbd-utils.spec force _localstatedir to use /var/lib in runtime (bsc#1203220) 
+
 -------------------------------------------------------------------
 Fri Sep 16 07:30:59 UTC 2022 - Roger Zhou <zzhou@suse.com>
 
diff --git a/drbd-utils.spec b/drbd-utils.spec
index b9e85c4..936a498 100644
--- a/drbd-utils.spec
+++ b/drbd-utils.spec
@@ -112,15 +112,12 @@ PATH=/sbin:$PATH ./configure \
     --with-initscripttype=systemd \
     --with-systemdunitdir=%{_prefix}/lib/systemd/system \
 %if !0%{?usrmerged}
-    --prefix=/usr \
     --sbindir=/sbin \
 %else
-    --prefix=%{_prefix} \
     --sbindir=%{_sbindir} \
 %endif
-%if 0%{?is_opensuse}
+    --prefix=%{_prefix} \
     --localstatedir=%{_localstatedir} \
-%endif
     --mandir=%{_mandir} \
     --sysconfdir=%{_sysconfdir} \
     --datarootdir=%{_datadir} \
@@ -136,10 +133,6 @@ PATH=/sbin:$PATH ./configure \
 %install
 %make_install
 
-%if !0%{?usrmerged}
-mkdir -p %{buildroot}%{_localstatedir}/lib/drbd
-%endif
-
 %ifnarch %{ix86} x86_64
 rm -rf %{buildroot}%{_sysconfdir}/xen
 %endif