packages: nagios/nagios.spec - enabled embedded perl (should it be subpacka...
glen
glen at pld-linux.org
Thu Jan 5 21:28:00 CET 2012
Author: glen Date: Thu Jan 5 20:28:00 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- enabled embedded perl (should it be subpackaged?)
---- Files affected:
packages/nagios:
nagios.spec (1.168 -> 1.169)
---- Diffs:
================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.168 packages/nagios/nagios.spec:1.169
--- packages/nagios/nagios.spec:1.168 Tue Jan 3 10:39:30 2012
+++ packages/nagios/nagios.spec Thu Jan 5 21:27:54 2012
@@ -4,6 +4,7 @@
#
# Conditional build:
%bcond_without gd # without statusmap and trends, which require gd library
+%bcond_without epn # without Embedded Perl
# reeenable when http://tracker.nagios.org/view.php?id=51 is fixed
%bcond_with tests
@@ -204,15 +205,17 @@
aplicativos para o Nagios.
%prep
-%setup -q -a4 -n %{name}
+%setup -qc -a4
+mv %{name}/* .
%undos cgi/*.c
%undos include/*.h
%undos base/*
+%undos p1.pl
%patch0 -p0
%patch1 -p1
%patch2 -p1
%patch3 -p1
-#fixed
+#fixed
#%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -233,6 +236,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
@@ -268,11 +275,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
@@ -294,22 +306,27 @@
INIT_OPTS="" \
COMMAND_OPTS=""
+%if %{with epn}
+mv $RPM_BUILD_ROOT{%{_sbindir},%{_libdir}/%{name}}/p1.pl
+install -p contrib/mini_epn $RPM_BUILD_ROOT%{_bindir}
+%endif
+
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
# install templated configuration files
for a in %{name}.cfg resource.cfg commands.cfg contactgroups.cfg contacts.cfg templates.cfg timeperiods.cfg; do
- cp -a sample-config/$a $RPM_BUILD_ROOT%{_sysconfdir}
+ cp -p sample-config/$a $RPM_BUILD_ROOT%{_sysconfdir}
done
# webserver files
-cp -a apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-cp -a apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
-cp -a lighttpd.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf
-cp -a sample-config/cgi.cfg $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
-cp -a %{SOURCE6} $RPM_BUILD_ROOT%{htmldir}/images
-cp -a %{SOURCE7} $RPM_BUILD_ROOT%{htmldir}/images
-cp -a %{SOURCE8} $RPM_BUILD_ROOT%{htmldir}/images
+cp -p apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
+cp -p apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+cp -p lighttpd.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf
+cp -p sample-config/cgi.cfg $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{htmldir}/images
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{htmldir}/images
+cp -p %{SOURCE8} $RPM_BUILD_ROOT%{htmldir}/images
> $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/passwd
echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group
@@ -455,6 +472,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}
@@ -524,6 +547,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.169 2012/01/05 20:27:54 glen
+- enabled embedded perl (should it be subpackaged?)
+
Revision 1.168 2012/01/03 09:39:30 glen
- package sample-config/mrtg.cfg into -mrtggraphs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.168&r2=1.169&f=u
More information about the pld-cvs-commit
mailing list