From d6fa1ac3e65088b315e02dbeffcc4cd619c8d8f590a6823ab87d972b0d2d2d41 Mon Sep 17 00:00:00 2001
From: nick wang <nwang@suse.com>
Date: Tue, 13 Oct 2020 13:51:23 +0000
Subject: [PATCH] Accepting request 841315 from
 home:olh:branches:network:ha-clustering:Factory

- Move block-drbd back to /etc/xen/scripts (bsc#1177531)
  The change in xen.spec was reverted, but the revert was not applied
  to this pkg

OBS-URL: https://build.opensuse.org/request/show/841315
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=100
---
 drbd-utils.changes |  7 +++++++
 drbd-utils.spec    | 17 -----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/drbd-utils.changes b/drbd-utils.changes
index 7cb6710..efa3c48 100644
--- a/drbd-utils.changes
+++ b/drbd-utils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 12 12:12:12 UTC 2020 - ohering@suse.de
+
+- Move block-drbd back to /etc/xen/scripts (bsc#1177531)
+  The change in xen.spec was reverted, but the revert was not applied
+  to this pkg
+
 -------------------------------------------------------------------
 Fri Sep 11 02:35:49 UTC 2020 - nick wang <nwang@suse.com>
 
diff --git a/drbd-utils.spec b/drbd-utils.spec
index ce13818..9ced66a 100644
--- a/drbd-utils.spec
+++ b/drbd-utils.spec
@@ -117,20 +117,6 @@ make OPTFLAGS="%{optflags}" %{?_smp_mflags}
 mkdir -p %{buildroot}%{_localstatedir}/lib/drbd
 %ifnarch %{ix86} x86_64
 rm -rf %{buildroot}%{_sysconfdir}/xen
-%else
-d=%{_libexecdir}/xen/scripts
-mkdir -p %{buildroot}$d
-mv %{buildroot}%{_sysconfdir}/xen/scripts/block-drbd %{buildroot}$d
-%if 0%{?suse_version} > 1500
-rm -rf %{buildroot}%{_sysconfdir}/xen
-%else
-tee %{buildroot}%{_sysconfdir}/xen/scripts/block-drbd <<_EOS_
-#!/bin/sh
-# SUSE versions up to SLE15 populated /etc with files.
-# This wrapper exists to remain compatible with their expected script path
-exec $d/block-drbd "\$@"
-_EOS_
-%endif
 %endif
 
 %pre
@@ -183,13 +169,10 @@ ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
 /sbin/drbdmon
 %endif
 %ifarch %{ix86} x86_64
-%if 0%{?suse_version} <= 1500
 %dir %attr(700,root,root) %{_sysconfdir}/xen
 %dir %{_sysconfdir}/xen/scripts
 %attr(755,root,root) %{_sysconfdir}/xen/scripts/block-drbd
 %endif
-%{_libexecdir}/xen
-%endif
 %{_prefix}/lib/ocf/resource.d/linbit/drbd
 %{_prefix}/lib/ocf/resource.d/linbit/drbd.shellfuncs.sh
 %{_udevrulesdir}/65-drbd.rules