From e822cc26bb6fadc3132491982560455d2fdb2971979227734f323bd99c50ca43 Mon Sep 17 00:00:00 2001 From: nick wang Date: Fri, 25 Aug 2017 07:13:15 +0000 Subject: [PATCH] Accepting request 518657 from network:ha-clustering:Unstable fate#323392, enable drbdmon which imported in 8.9.10 OBS-URL: https://build.opensuse.org/request/show/518657 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd-utils?expand=0&rev=47 --- drbd-utils.changes | 5 +++++ drbd-utils.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/drbd-utils.changes b/drbd-utils.changes index 946d28c..38ebf04 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 25 06:45:36 UTC 2017 - nwang@suse.com + +- fate#323392, enable drbdmon which imported in 8.9.10 + ------------------------------------------------------------------- Fri Aug 11 06:09:20 UTC 2017 - nwang@suse.com diff --git a/drbd-utils.spec b/drbd-utils.spec index 0be3b46..2e32da4 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%bcond_without drbdmon Name: drbd-utils Version: 9.0.0 @@ -62,6 +63,9 @@ BuildRequires: make BuildRequires: pkgconfig BuildRequires: systemd BuildRequires: udev +%if %{with drbdmon} +BuildRequires: gcc-c++ +%endif Provides: drbd-control Provides: drbdsetup BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -101,6 +105,7 @@ PATH=/sbin:$PATH ./configure \ --datadir=%{_datadir} \ --libdir=%{_prefix}/lib \ --exec_prefix=%{_prefix}/lib \ + %{?with_drbdmon: --with-drbdmon} \ --with-tmpfilesdir=%{_tmpfilesdir} make OPTFLAGS="%{optflags}" %{?_smp_mflags} @@ -142,6 +147,9 @@ rm -rf %{buildroot}%{_sysconfdir}/xen /sbin/drbdsetup /sbin/drbdmeta /sbin/drbd-overview +%if %{with drbdmon} +/sbin/drbdmon +%endif %ifarch %ix86 x86_64 %dir %attr(700,root,root) %{_sysconfdir}/xen %dir %{_sysconfdir}/xen/scripts