[packages/eventum] Revert "- migrate to apache 2.4"

[glen]

commit 87ca28caebac1deacc8838bf8a513f0b45771013
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 28 22:53:28 2013 +0200

    Revert "- migrate to apache 2.4"
    
    This reverts commit 21a29ca417a2f549b8241c92f97ba95dd4d8ff62.
    
    Conflicts:
    	eventum.spec

 eventum-httpd.conf | 47 -----------------------------------------------
 eventum.spec       |  8 +++-----
 2 files changed, 3 insertions(+), 52 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index cf03ec7..8cf88ea 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -36,7 +36,6 @@ Source15:	%{name}-lighttpd.conf
 Source16:	http://www.isocra.com/images/updown2.gif
 # Source16-md5:	deb6eeb2552ba757d3a949ed10c4107d
 Source17:	%{name}.tmpfiles
-Source18:	%{name}-httpd.conf
 Patch0:		%{name}-lf.patch
 Patch2:		%{name}-order.patch
 Patch3:		group-users.patch
@@ -89,7 +88,6 @@ Requires:	webserver(indexfile)
 Requires:	webserver(php) >= 4.2.0
 Suggests:	localedb
 Suggests:	php-pear-Net_LDAP2
-Conflicts:	apache-base < 2.4.0-1
 Conflicts:	logrotate < 3.8.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -523,7 +521,7 @@ install -d \
 
 touch $RPM_BUILD_ROOT%{_webappdir}/htpasswd
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
-cp -p %{SOURCE18} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
 cp -p %{SOURCE15} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf
 
 install -d $RPM_BUILD_ROOT/etc/sphinx
@@ -630,10 +628,10 @@ fi
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache-base
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache-base
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
diff --git a/eventum-httpd.conf b/eventum-httpd.conf
deleted file mode 100644
index 2dbd46b..0000000
--- a/eventum-httpd.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-# Eventum is under /eventum
-Alias /eventum /usr/share/eventum/htdocs
-
-# Eventum is running under VirtualHost
-#<VirtualHost *:80>
-#	ServerName eventum.example.org
-#	DocumentRoot /usr/share/eventum/htdocs
-#</VirtualHost>
-
-#<VirtualHost *:443>
-#	ServerName eventum.example.org
-#	DocumentRoot /usr/share/eventum/htdocs
-#</VirtualHost>
-
-<Directory /usr/share/eventum/htdocs>
-	AllowOverride None
-	Require all granted
-
-	# Make whole eventum password protected
-#	AllowOverride None
-#	Deny from all
-#	AuthType Basic
-#	AuthUserFile /etc/webapps/eventum/users
-#	AuthGroupFile /etc/webapps/eventum/groups
-#	AuthName "Eventum"
-#	Require group eventum
-#	Satisfy any
-
-	# for SCM integration
-	<Files scm_ping.php>
-		# Set here IP of host running CVS
-		Require local
-#		Require ip xxx.xxx.xxx.xxx
-	</Files>
-
-	# rss has it's own authorization
-	<Files rss.php>
-		Require all granted
-	</Files>
-</Directory>
-
-# RPC for CLI interface
-<Directory /usr/share/eventum/htdocs/rpc>
-	# Add here clients whom you want to allow CLI access
-	Require local
-#	Require ip xxx.xxx.xxx.xxx
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/a935e701c6f46c8a922c4bb7d1506775b94a4de6