packages: nagios/nagios.spec - wtf? revert 1.175. if you don't like it, dis...

glen glen at pld-linux.org
Tue Feb 7 13:27:48 CET 2012


Author: glen                         Date: Tue Feb  7 12:27:48 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- wtf? revert 1.175. if you don't like it, discuss/report bug first, or build with bcond off

---- Files affected:
packages/nagios:
   nagios.spec (1.177 -> 1.178) 

---- Diffs:

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.177 packages/nagios/nagios.spec:1.178
--- packages/nagios/nagios.spec:1.177	Tue Feb  7 11:38:46 2012
+++ packages/nagios/nagios.spec	Tue Feb  7 13:27:42 2012
@@ -217,7 +217,8 @@
 aplicativos para o Nagios.
 
 %prep
-%setup -q -a4 -n %{name}
+%setup -qc -a4
+mv %{name}/* .
 %undos cgi/*.c
 %undos include/*.h
 %undos base/*
@@ -246,6 +247,10 @@
 	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
 
@@ -290,11 +295,16 @@
 	--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
@@ -316,6 +326,12 @@
 	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}
 
@@ -477,6 +493,12 @@
 
 %{_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}
@@ -549,6 +571,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.178  2012/02/07 12:27:42  glen
+- wtf? revert 1.175. if you don't like it, discuss/report bug first, or build with bcond off
+
 Revision 1.177  2012/02/07 10:38:46  cieciwa
 - s/-qc/-q/
 
================================================================

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



More information about the pld-cvs-commit mailing list