Accepting request 198427 from home:lisaseraph:branches:network:ha-clustering:Factory

update corosync.spec for fixing build issue

OBS-URL: https://build.opensuse.org/request/show/198427
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=34

corosync.spec

@@ -20,6 +20,7 @@
 # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
 # to disable or enable specific features
 %bcond_with testagents
+%define with_testagents	1
 %bcond_with watchdog
 %bcond_with monitoring
 %bcond_with snmp
@@ -28,6 +29,7 @@
 %bcond_with upstart
 %bcond_with xmlconf
 %bcond_with runautogen
+%define with_runautogen 1
 
 %if 0%{?sles_version} == 11 
 %ifnarch s390 s390x 
@@ -59,7 +61,7 @@ Requires:       libcorosync4 = %{version}-%{release}
 BuildRequires:  libqb-devel
 BuildRequires:  mozilla-nss
 BuildRequires:  mozilla-nss-devel
-%if %{with runautogen}
+%if %{with_runautogen}
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -74,11 +76,10 @@ BuildRequires:  librdmacm-devel
 %if %{with snmp}
 BuildRequires:  net-snmp-devel
 %endif
-#%if %{with dbus}
+%if %{with dbus}
 BuildRequires:  dbus-1-devel
-#%endif
+%endif
 %if %{with_systemd}
-#BuildRequires:  systemd-devel
 BuildRequires:  systemd
 Requires(post): systemd
 Requires(preun): systemd
@@ -93,9 +94,9 @@ Requires:       libxslt
 %patch1 -p1
 
 %build
-%if 0%{?buildtrunk} == 1
+#%if 0%{?buildtrunk} == 1
 ./autogen.sh
-%endif
+#%endif
 
 %if %{with rdma}
 export ibverbs_CFLAGS=-I/usr/include/infiniband \
@@ -104,8 +105,10 @@ export rdmacm_CFLAGS=-I/usr/include/rdma \
 export rdmacm_LIBS=-lrdmacm \
 %endif
 %{configure} \
-%if %{with testagents}
+%if %{with_testagents}
 	--enable-testagents \
+	--enable-augeas \
+	--enable-debug \
 %endif
 %if %{with watchdog}
 	--enable-watchdog \
@@ -131,8 +134,6 @@ export rdmacm_LIBS=-lrdmacm \
 	--with-initddir=%{_initrddir} \
 	--with-systemddir=%{_unitdir} \
 	--with-upstartdir=%{_sysconfdir}/init 
-#	--enable-dbus \
-#--enable-systemd 
 
 make %{_smp_mflags}
 
@@ -259,6 +260,36 @@ fi
 %{_mandir}/man5/*.5*
 %{_mandir}/man3/*.3*
 
+# optional testagent rpm
+#
+%if %{with_testagents}
+
+%package -n corosync-testagents
+Summary:        The Corosync Cluster Engine Test Agents
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description -n corosync-testagents
+This package contains corosync test agents.
+
+%files -n corosync-testagents
+%defattr(755,root,root,-)
+%dir %{_datadir}/corosync/tests
+%dir %{_datadir}/augeas
+%dir %{_datadir}/augeas/lenses
+%dir %{_datadir}/augeas/lenses/tests
+%{_datadir}/corosync/tests/mem_leak_test.sh
+%{_datadir}/corosync/tests/net_breaker.sh
+%{_datadir}/corosync/tests/cmap-dispatch-deadlock.sh
+%{_datadir}/corosync/tests/shm_leak_audit.sh
+%{_datadir}/augeas/lenses/corosync.aug
+%{_datadir}/augeas/lenses/tests/test_corosync.aug
+%{_bindir}/cpg_test_agent
+%{_bindir}/sam_test_agent
+%{_bindir}/votequorum_test_agent
+
+%endif
+
 # library
 #
 %package -n libcorosync4