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

[glen]

commit 2c17253a9d80a30327f2e899b1bd16e10502a612
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Sep 1 15:59:44 2015 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit fddf822a29702b34ec9578a7307e1f5c56c9993f.

 httpd.conf  |  7 -------
 phorum.spec | 12 +++++-------
 2 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/phorum.spec b/phorum.spec
index 24fbd65..c0992ae 100644
--- a/phorum.spec
+++ b/phorum.spec
@@ -13,8 +13,7 @@ License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
 # Source0-md5:	6151520b21eb40c1afa6d02a3afc2886
-Source1:	apache.conf
-Source2:	httpd.conf
+Source3:	apache.conf
 Patch0:		paths.patch
 Patch1:		mysql.patch
 Patch2:		docsurl.patch
@@ -43,7 +42,6 @@ Requires:	webapps
 Requires:	webserver(access)
 Requires:	webserver(alias)
 Requires:	webserver(php) >= %{php_min_version}
-Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -347,8 +345,8 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},%{_cachedir}}
 cp -a *.php htdocs include mods templates scripts $RPM_BUILD_ROOT%{_appdir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p config.php.sample $RPM_BUILD_ROOT%{_sysconfdir}/config.php
 
 cat > langmap <<'EOF'
@@ -468,10 +466,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}
 
 %files -f %{name}.lang
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index 893b8b3..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-Alias /phorum /usr/share/phorum/htdocs
-<Directory /usr/share/phorum/htdocs>
-	AllowOverride None
-	Require all granted
-
-	php_flag register_globals off
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phorum.git/commitdiff/232d23fa1fed0d53ea717f0c05368722a9048cec