SPECS: nagios.spec - lib64 safe apache config

glen glen at pld-linux.org
Tue Mar 14 15:48:17 CET 2006


Author: glen                         Date: Tue Mar 14 14:48:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- lib64 safe apache config

---- Files affected:
SPECS:
   nagios.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: SPECS/nagios.spec
diff -u SPECS/nagios.spec:1.72 SPECS/nagios.spec:1.73
--- SPECS/nagios.spec:1.72	Sun Mar  5 16:20:15 2006
+++ SPECS/nagios.spec	Tue Mar 14 15:48:12 2006
@@ -178,6 +178,8 @@
 	s,".*/libexec/eventhandlers,"%{_libdir}/%{name}/eventhandlers,
 ' $(find contrib/eventhandlers -type f)
 
+sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE1} > apache.conf
+
 %build
 cp -f /usr/share/automake/config.sub .
 %{__aclocal}
@@ -215,8 +217,8 @@
 tar jxf %{SOURCE5} --strip-components=1 -C $RPM_BUILD_ROOT%{_sysconfdir}
 
 # webserver files
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
+install apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 mv $RPM_BUILD_ROOT{%{_sysconfdir}/cgi.cfg,%{_webapps}/%{_webapp}}
 > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/passwd
 echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group
@@ -462,6 +464,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2006/03/14 14:48:12  glen
+- lib64 safe apache config
+
 Revision 1.72  2006/03/05 15:20:15  glen
 - use %service, adapterized, cosmetics
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nagios.spec?r1=1.72&r2=1.73&f=u



More information about the pld-cvs-commit mailing list