From: Elan Ruusamäe Date: Tue, 7 Feb 2012 12:27:42 +0000 (+0000) Subject: - wtf? revert 1.175. if you don't like it, discuss/report bug first, or build with... X-Git-Tag: auto/th/nagios-3_4_1-1~7 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fnagios.git;a=commitdiff_plain;h=7f0097ee7b3c28d1176dcf6270d1d69e71ffc467 - wtf? revert 1.175. if you don't like it, discuss/report bug first, or build with bcond off Changed files: nagios.spec -> 1.178 --- diff --git a/nagios.spec b/nagios.spec index 5dd4968..2f17833 100644 --- a/nagios.spec +++ b/nagios.spec @@ -216,7 +216,8 @@ Este pacote contém arquivos de cabeçalho usados no desenvolvimento de aplicativos para o Nagios. %prep -%setup -q -a4 -n %{name} +%setup -qc -a4 +mv %{name}/* . %undos cgi/*.c %undos include/*.h %undos base/* @@ -245,6 +246,10 @@ sed -i -e ' s,".*/libexec/eventhandlers,"%{_libdir}/%{name}/eventhandlers, ' $(find contrib/eventhandlers -type f) +%{__sed} -i -e ' + s,/usr/local/nagios/var/,/var/log/%{name}/,g +' p1.pl + sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE1} > apache.conf sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE5} > lighttpd.conf @@ -289,11 +294,16 @@ cd .. --with-checkresult-dir=%{_var}/spool/%{name}/checkresults \ --with-ping_command='/bin/ping -n %%s -c %%d' \ %{!?with_gd:--disable-statusmap --disable-trends} \ + %{?with_epn:--enable-embedded-perl --with-perlcache} \ %{?with_tests:--enable-libtap} \ --enable-event-broker %{__make} all +%if %{with epn} +%{__make} -C contrib mini_epn +%endif + %{?with_tests:%{__make} test} %install @@ -315,6 +325,12 @@ cp -p include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name} INIT_OPTS="" \ COMMAND_OPTS="" +%if %{with epn} +mv $RPM_BUILD_ROOT{%{_sbindir},%{_libdir}/%{name}}/p1.pl +install -d $RPM_BUILD_ROOT%{_bindir} +install -p contrib/mini_epn $RPM_BUILD_ROOT%{_bindir} +%endif + install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name} @@ -476,6 +492,12 @@ done %{_examplesdir}/%{name}-%{version} +# epn +%if %{with epn} +%attr(755,root,root) %{_libdir}/%{name}/p1.pl +%attr(755,root,root) %{_bindir}/mini_epn +%endif + %files common %defattr(644,root,root,755) %attr(750,root,nagcmd) %dir %{_sysconfdir}