From 865cbb1cbf492a61de88183c3feb67f472fb5b6b813148ab12fed35289594819 Mon Sep 17 00:00:00 2001 From: heming zhao Date: Mon, 7 Nov 2022 13:36:32 +0000 Subject: [PATCH] Accepting request 1033913 from home:zzhou:branches:network:ha-clustering:Factory bsc#1204276 remove crm-fence-peer.sh for drbd8 OBS-URL: https://build.opensuse.org/request/show/1033913 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=118 --- drbd-utils.changes | 9 +++++++-- drbd-utils.spec | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drbd-utils.changes b/drbd-utils.changes index 81b4a13..e455532 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 14 06:37:53 UTC 2022 - Roger Zhou + +- bsc#1204276 remove crm-fence-peer.sh for drbd8 to avoid confusion with v9 + ------------------------------------------------------------------- Wed Sep 21 13:11:34 UTC 2022 - Roger Zhou @@ -35,7 +40,7 @@ Fri Sep 17 08:05:56 UTC 2021 - nick wang ------------------------------------------------------------------- Wed Jul 21 07:20:21 UTC 2021 - nick wang -- Update to 9.18.0 +- Update to 9.18.0 (bsc#1189363) * build: remove rpm related targets * drbdsetup,v84: fix minor compile warnings * systemd: resource specific activation @@ -72,7 +77,7 @@ Wed Apr 21 10:15:08 UTC 2021 - Matthias Gerstner The Makefile explicitly passes -fPIC, thereby breaking our gcc-PIE profile. In addition the Makefile also ignores CXXFLAGS and LDFLAGS passed via the environment. Therefore fix it with this patch. This makes drbdmon a PIE - binary (bsc#1184122). + binary (bsc#1184122, bsc#1185132). ------------------------------------------------------------------- Tue Nov 17 16:01:34 UTC 2020 - Ludwig Nussel diff --git a/drbd-utils.spec b/drbd-utils.spec index 936a498..89823d1 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -137,6 +137,8 @@ PATH=/sbin:$PATH ./configure \ rm -rf %{buildroot}%{_sysconfdir}/xen %endif +rm -rf %{buildroot}%{libdir}/drbd/crm-*fence-peer.sh # bsc#1204276 + %pre %service_add_pre %{services}