Author: glen Date: Mon Dec 6 22:45:01 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use name macro where appropriate
---- Files affected:
packages/nagios:
nagios.spec (1.159 -> 1.160)
---- Diffs:
================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.159 packages/nagios/nagios.spec:1.160
--- packages/nagios/nagios.spec:1.159 Sun Dec 5 12:35:54 2010
+++ packages/nagios/nagios.spec Mon Dec 6 23:44:55 2010
@@ -162,7 +162,7 @@
Summary: Default Nagios theme
Summary(pl.UTF-8): Domyślny motyw Nagiosa
Group: Applications/WWW
-Requires: nagios-cgi = %{version}-%{release}
+Requires: %{name}-cgi = %{version}-%{release}
Requires: webserver(php)
Provides: nagios-theme
Obsoletes: nagios-theme
@@ -213,7 +213,7 @@
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
sed -i -e '
- s,".*/var/rw/nagios.cmd,"%{_localstatedir}/rw/nagios.cmd,
+ s,".*/var/rw/%{name}.cmd,"%{_localstatedir}/rw/%{name}.cmd,
s,".*/libexec/eventhandlers,"%{_libdir}/%{name}/eventhandlers,
' $(find contrib/eventhandlers -type f)
@@ -225,14 +225,14 @@
# kill trailing spaces
s, \+$,,
# use real paths
- s,/usr/local/nagios/share,@datadir@,g
+ s,/usr/local/%{name}/share,@datadir@,g
# we want all authorized users have default access
s,=nagiosadmin,=*,g
' sample-config/*.cfg.in
# fixup paths in doc
%{__sed} -i -e '
- s,/usr/local/nagios/var/archives/,/var/log/nagios/archives/,
+ s,/usr/local/%{name}/var/archives/,/var/log/%{name}/archives/,
' html/docs/configmain.html
%build
@@ -279,7 +279,7 @@
cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
# install templated configuration files
-for a in nagios.cfg resource.cfg commands.cfg contactgroups.cfg contacts.cfg
templates.cfg timeperiods.cfg; do
+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}
done
@@ -301,10 +301,10 @@
find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name '*.in' | xargs rm
# Object data/cache files
-for i in {objects.{cache,precache},{retention,status}.dat,nagios.tmp}; do
+for i in {objects.{cache,precache},{retention,status}.dat,%{name}.tmp}; do
> $RPM_BUILD_ROOT%{_localstatedir}/$i
done
-> $RPM_BUILD_ROOT%{_localstatedir}/rw/nagios.cmd
+> $RPM_BUILD_ROOT%{_localstatedir}/rw/%{name}.cmd
install -d $RPM_BUILD_ROOT%{_docdir}/%{name}
mv $RPM_BUILD_ROOT{%{_datadir}/docs/*,%{_docdir}/%{name}}
@@ -340,9 +340,9 @@
%groupadd -g 72 nagios
%groupadd -g 147 -f nagcmd
if [ -n "$(id -u netsaint 2>/dev/null)" ] && [ "$(id -u netsaint)" = "72" ];
then
- /usr/sbin/usermod -d %{_libdir}/nagios -l nagios -c "Nagios Daemon" -G
nagcmd netsaint
+ /usr/sbin/usermod -d %{_libdir}/%{name} -l nagios -c "Nagios Daemon" -G
nagcmd netsaint
fi
-%useradd -u 72 -d %{_libdir}/nagios -s /bin/false -c "Nagios Daemon" -g nagios
-G nagcmd nagios
+%useradd -u 72 -d %{_libdir}/%{name} -s /bin/false -c "Nagios Daemon" -g
nagios -G nagcmd nagios
%postun common
if [ "$1" = "0" ]; then
@@ -392,7 +392,7 @@
mv -f %{_sysconfdir}/$a{.rpmsave,}
fi
done
-%{__sed} -i -e
's,^check_result_path=.*,check_result_path=%{_var}/spool/%{name}/checkresults,'
%{_sysconfdir}/nagios.cfg
+%{__sed} -i -e
's,^check_result_path=.*,check_result_path=%{_var}/spool/%{name}/checkresults,'
%{_sysconfdir}/%{name}.cfg
%files
%defattr(644,root,root,755)
@@ -400,7 +400,7 @@
%attr(750,root,nagios) %dir %{_sysconfdir}/objects
# leave main nagios config readable for -cgi.
-%attr(640,root,nagcmd) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/nagios.cfg
+%attr(640,root,nagcmd) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}.cfg
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/commands.cfg
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/contactgroups.cfg
@@ -420,7 +420,7 @@
%attr(770,root,nagcmd) %dir %{_localstatedir}
%attr(2770,root,nagcmd) %dir %{_localstatedir}/rw
-%attr(660,nagios,nagcmd) %ghost %{_localstatedir}/rw/nagios.cmd
+%attr(660,nagios,nagcmd) %ghost %{_localstatedir}/rw/%{name}.cmd
%attr(664,root,nagios) %ghost %{_localstatedir}/objects.cache
%attr(664,root,nagios) %ghost %{_localstatedir}/objects.precache
%attr(664,root,nagios) %ghost %{_localstatedir}/*.dat
@@ -495,6 +495,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.160 2010/12/06 22:44:55 glen
+- use name macro where appropriate
+
Revision 1.159 2010/12/05 11:35:54 glen
- sane (sortable) archive filename
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.159&r2=1.160&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
