packages: nagios/nagios.spec - use htmldir and cgidir macros instead of red...

[glen]

Author: glen                         Date: Mon Dec  6 23:18:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use htmldir and cgidir macros instead of redefined common path macros

---- Files affected:
packages/nagios:
   nagios.spec (1.160 -> 1.161) 

---- Diffs:

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.160 packages/nagios/nagios.spec:1.161
--- packages/nagios/nagios.spec:1.160	Mon Dec  6 23:44:55 2010
+++ packages/nagios/nagios.spec	Tue Dec  7 00:18:53 2010
@@ -61,9 +61,8 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/%{name}
-%define		_bindir		%{_prefix}/sbin
-%define		_sbindir	%{_libdir}/%{name}/cgi
-%define		_datadir	%{_prefix}/share/%{name}
+%define		cgidir		%{_libdir}/%{name}/cgi
+%define		htmldir		%{_prefix}/share/%{name}
 %define		_localstatedir	/var/lib/%{name}
 %define		_webapps	/etc/webapps
 %define		_webapp		%{name}
@@ -241,6 +240,9 @@
 %{__autoconf}
 %configure \
 	CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+	--bindir=%{_sbindir} \
+	--sbindir=%{cgidir} \
+	--datadir=%{htmldir} \
 	--with-nagios-user=%{name} \
 	--with-nagios-grp=%{name} \
 	--with-command-user=%{name} \
@@ -288,9 +290,9 @@
 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%{_datadir}/images
-cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/images
-cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/images
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{htmldir}/images
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{htmldir}/images
+cp -a %{SOURCE8} $RPM_BUILD_ROOT%{htmldir}/images
 > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/passwd
 echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group
 
@@ -307,7 +309,7 @@
 > $RPM_BUILD_ROOT%{_localstatedir}/rw/%{name}.cmd
 
 install -d $RPM_BUILD_ROOT%{_docdir}/%{name}
-mv $RPM_BUILD_ROOT{%{_datadir}/docs/*,%{_docdir}/%{name}}
+mv $RPM_BUILD_ROOT{%{htmldir}/docs/*,%{_docdir}/%{name}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -412,8 +414,8 @@
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 
-%attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_bindir}/nagiostats
+%attr(755,root,root) %{_sbindir}/%{name}
+%attr(755,root,root) %{_sbindir}/nagiostats
 
 %attr(770,root,nagcmd) %dir %{_var}/log/%{name}
 %attr(770,root,nagcmd) %dir %{_var}/log/%{name}/archives
@@ -459,30 +461,30 @@
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/cgi.cfg
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/passwd
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/group
-%dir %{_sbindir}
-%attr(755,root,root) %{_sbindir}/*.cgi
+%dir %{cgidir}
+%attr(755,root,root) %{cgidir}/*.cgi
 
-%dir %{_datadir}
-%dir %{_datadir}/includes
-%dir %{_datadir}/images
-%dir %{_datadir}/stylesheets
-%{_datadir}/robots.txt
-%{_datadir}/contexthelp
-%{_datadir}/media
-%{_datadir}/ssi
-%{_datadir}/images/favicon.ico
-%{_datadir}/images/marker.png
-%{_datadir}/images/shadow50.png
+%dir %{htmldir}
+%dir %{htmldir}/includes
+%dir %{htmldir}/images
+%dir %{htmldir}/stylesheets
+%{htmldir}/robots.txt
+%{htmldir}/contexthelp
+%{htmldir}/media
+%{htmldir}/ssi
+%{htmldir}/images/favicon.ico
+%{htmldir}/images/marker.png
+%{htmldir}/images/shadow50.png
 
 %files theme-default
 %defattr(644,root,root,755)
-%{_datadir}/*.php
-%{_datadir}/includes/*
-%{_datadir}/images/*
-%exclude %{_datadir}/images/favicon.ico
-%exclude %{_datadir}/images/marker.png
-%exclude %{_datadir}/images/shadow50.png
-%{_datadir}/stylesheets/*
+%{htmldir}/*.php
+%{htmldir}/includes/*
+%{htmldir}/images/*
+%exclude %{htmldir}/images/favicon.ico
+%exclude %{htmldir}/images/marker.png
+%exclude %{htmldir}/images/shadow50.png
+%{htmldir}/stylesheets/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -495,6 +497,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2010/12/06 23:18:53  glen
+- use htmldir and cgidir macros instead of redefined common path macros
+
 Revision 1.160  2010/12/06 22:44:55  glen
 - use name macro where appropriate
 
================================================================

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