[packages/phorum] - migrated to apache 2.4

[baggins]

commit fddf822a29702b34ec9578a7307e1f5c56c9993f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 16 21:33:32 2013 +0200

    - migrated to apache 2.4

 apache.conf |  1 -
 httpd.conf  |  7 +++++++
 phorum.spec | 14 ++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/phorum.spec b/phorum.spec
index 8647312..51398a4 100644
--- a/phorum.spec
+++ b/phorum.spec
@@ -8,12 +8,13 @@ Summary:	Phorum is a web based message board written in PHP
 Summary(pl.UTF-8):	Phorum - implementacja forum WWW w PHP
 Name:		phorum
 Version:	%{mainver}.19
-Release:	0.1
+Release:	1
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
 # Source0-md5:	6151520b21eb40c1afa6d02a3afc2886
-Source3:	apache.conf
+Source1:	apache.conf
+Source2:	httpd.conf
 Patch0:		paths.patch
 Patch1:		mysql.patch
 Patch2:		docsurl.patch
@@ -42,6 +43,7 @@ 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)
 
@@ -345,8 +347,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 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p config.php.sample $RPM_BUILD_ROOT%{_sysconfdir}/config.php
 
 cat > langmap <<'EOF'
@@ -466,10 +468,10 @@ fi
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %files -f %{name}.lang
diff --git a/apache.conf b/apache.conf
index c18e086..43024b9 100644
--- a/apache.conf
+++ b/apache.conf
@@ -1,4 +1,3 @@
-# $Id$
 Alias /phorum /usr/share/phorum/htdocs
 <Directory /usr/share/phorum/htdocs>
 	AllowOverride None
diff --git a/httpd.conf b/httpd.conf
new file mode 100644
index 0000000..893b8b3
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,7 @@
+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/fddf822a29702b34ec9578a7307e1f5c56c9993f