packages: nagios/nagios.spec - tests bcond (disabled for now)

arekm arekm at pld-linux.org
Thu Jul 9 09:05:53 CEST 2009


Author: arekm                        Date: Thu Jul  9 07:05:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- tests bcond (disabled for now)

---- Files affected:
packages/nagios:
   nagios.spec (1.122 -> 1.123) 

---- Diffs:

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.122 packages/nagios/nagios.spec:1.123
--- packages/nagios/nagios.spec:1.122	Thu Jul  9 08:48:23 2009
+++ packages/nagios/nagios.spec	Thu Jul  9 09:05:47 2009
@@ -2,6 +2,8 @@
 #
 # Conditional build:
 %bcond_without	gd	# without statusmap and trends, which require gd library
+# reeenable when http://tracker.nagios.org/view.php?id=51 is fixed
+%bcond_with	tests
 #
 Summary:	Host/service/network monitoring program
 Summary(pl.UTF-8):	Program do monitorowania serwerów/usług/sieci
@@ -199,11 +201,14 @@
 	--with-command-grp=%{name} \
 	--with-lockfile=%{_localstatedir}/%{name}.pid \
 	--with-ping_command='/bin/ping -n %%s -c %%d' \
-	--enable-event-broker \
-	%{!?with_gd:--disable-statusmap --disable-trends}
+	%{!?with_gd:--disable-statusmap --disable-trends} \
+	%{?with_tests:--enable-libtap} \
+	--enable-event-broker
 
 %{__make} all
 
+%{?with_tests:%{__make} test}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_webapps}/%{_webapp}} \
@@ -499,6 +504,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123  2009/07/09 07:05:47  arekm
+- tests bcond (disabled for now)
+
 Revision 1.122  2009/07/09 06:48:23  arekm
 - up to 3.2.1 (3.2 is stable series now)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.122&r2=1.123&f=u



More information about the pld-cvs-commit mailing list