[packages/nagios] Revert "- migrated to apache 2.4"

[glen]

commit 218b60a4e3d62f1c39b362351ca11e8614cc7351
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jan 31 00:25:04 2014 +0200

    Revert "- migrated to apache 2.4"
    
    This reverts commit ee3edbbec9bc0fd20a5ca5f4f768076e4e08c2c7.
    
    Conflicts:
    	nagios-httpd.conf
    	nagios.spec

 nagios-apache.conf | 2 ++
 nagios.spec        | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/nagios.spec b/nagios.spec
index 8373d48..3e5ab72 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -30,7 +30,6 @@ Source7:	http://www.google.com/mapfiles/marker.png
 # Source7-md5:	edefef4bdfc29e1c953694651f05b466
 Source8:	googlemap.js
 Source9:	%{name}wall.php
-Source10:	%{name}-httpd.conf
 Patch0:		%{name}-resources.patch
 Patch1:		%{name}-iconv-in-libc.patch
 Patch2:		%{name}-webapps.patch
@@ -155,7 +154,6 @@ Requires:	webserver(cgi)
 Requires:	webserver(indexfile)
 Suggests:	%{name}-doc
 Suggests:	php-magpierss >= 0.72
-Conflicts:	apache-base < 2.4.0-1
 
 %description cgi
 CGI webinterface for Nagios.
@@ -275,7 +273,6 @@ sed -i -e '
 ' $(find contrib/eventhandlers -type f)
 
 sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE1} > apache.conf
-sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE10} > httpd.conf
 sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE5} > lighttpd.conf
 
 # fixup cgi config
@@ -349,7 +346,7 @@ done
 
 # webserver files
 cp -p apache.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-cp -p httpd.conf $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.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
@@ -438,11 +435,11 @@ fi
 %triggerun cgi -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin cgi -- apache-base
+%triggerin cgi -- apache < 2.2.0, apache-base
 %addusertogroup http nagcmd
 %webapp_register httpd %{_webapp}
 
-%triggerun cgi -- apache-base
+%triggerun cgi -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin cgi -- lighttpd
diff --git a/nagios-apache.conf b/nagios-apache.conf
index d79a87e..57c2575 100644
--- a/nagios-apache.conf
+++ b/nagios-apache.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 <Directory ~ "/usr/lib/nagios/cgi/|/usr/share/nagios/">
 	Options ExecCGI
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios.git/commitdiff/9e1fada60d0446be02e560131f355ae2ccb6a764