From 2f5235a66eda915a59d7b026c3c3ed3c349cd73e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 8 Jan 2012 01:09:53 +0000 Subject: [PATCH] - update deps for tests, regen libtool for internal tap Changed files: nagios.spec -> 1.173 --- nagios.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/nagios.spec b/nagios.spec index 5557588..38f3115 100644 --- a/nagios.spec +++ b/nagios.spec @@ -41,13 +41,17 @@ Patch9: %{name}-html-Makefile.in.patch URL: http://www.nagios.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: sed >= 4.0 %if %{with gd} BuildRequires: gd-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel %endif -BuildRequires: rpmbuild(macros) >= 1.268 -BuildRequires: sed >= 4.0 +%if %{with tests} +BuildRequires: perl-HTML-Lint +BuildRequires: perl-Test-WWW-Mechanize-CGI +%endif Requires(post,preun): /sbin/chkconfig Requires: %{name}-common = %{version}-%{release} Requires: rc-scripts @@ -265,10 +269,19 @@ sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE5} > lighttpd.conf # s,/usr/local/%{name}/var/archives/,/var/log/%{name}/archives/, #' html/docs/configmain.html +#rm t/611cgistatus-hosturgencies.t + %build cp -f /usr/share/automake/config.sub . %{__aclocal} %{__autoconf} +%if %{with tests} +cd tap +%{__libtoolize} +%{__aclocal} +%{__autoconf} +cd .. +%endif %configure \ CFLAGS="%{rpmcflags} %{rpmcppflags}" \ --bindir=%{_sbindir} \ -- 2.44.0