Accepting request 518658 from network:ha-clustering:Factory

1

OBS-URL: https://build.opensuse.org/request/show/518658
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd-utils?expand=0&rev=17

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
 

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