commit 5541095289c55fe2a2c4a9c683ea6fff8e47cfd6
Author: Elan Ruusamäe <[email protected]>
Date: Tue Jul 9 10:03:37 2013 +0300
Revert "- migrated to apache 2.4"
This reverts commit aadb21058eb057fd96acca30dd8f5861dbe61357.
apache.conf | 6 +++++-
htmlgrid-charisma.spec | 10 ++++------
httpd.conf | 8 --------
3 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/htmlgrid-charisma.spec b/htmlgrid-charisma.spec
index 3f77419..21495d5 100644
--- a/htmlgrid-charisma.spec
+++ b/htmlgrid-charisma.spec
@@ -1,20 +1,18 @@
Summary: Charisma - free, responsive, multiple skin admin template
Name: htmlgrid-charisma
Version: 1.0.0
-Release: 2
+Release: 1
License: Apache v2.0
Group: Applications/WWW
Source0:
https://github.com/usmanhalalit/charisma/archive/master.tar.gz?/charisma.tgz
# Source0-md5: b0278cac300ee0f6d22c957a124c4b0f
Source1: apache.conf
Source2: lighttpd.conf
-Source3: httpd.conf
URL: http://usman.it/free-responsive-admin-template/
BuildRequires: rpmbuild(macros) >= 1.268
Requires: webapps
Requires: webserver(access)
Requires: webserver(alias)
-Conflicts: apache-base < 2.4.0-1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -69,7 +67,7 @@ cp -a js css img $RPM_BUILD_ROOT%{_appdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
%triggerin -- apache1 < 1.3.37-3, apache1-base
%webapp_register apache %{_webapp}
@@ -77,10 +75,10 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%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/apache.conf b/apache.conf
index 107746c..1cff060 100644
--- a/apache.conf
+++ b/apache.conf
@@ -1,8 +1,12 @@
Alias /themes/charisma /usr/share/htmlgrid-charisma
-
<Directory /usr/share/htmlgrid-charisma>
+ # Apache 1.3 / 2.0
<IfModule mod_access.c>
Allow from all
</IfModule>
+ # Apache 2.2+
+ <IfModule mod_authz_host.c>
+ Allow from all
+ </IfModule>
Options +FollowSymLinks
</Directory>
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index 3bfca5a..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-Alias /themes/charisma /usr/share/htmlgrid-charisma
-
-<Directory /usr/share/htmlgrid-charisma>
- <IfModule mod_authz_host.c>
- Require all granted
- </IfModule>
- Options +FollowSymLinks
-</Directory>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/htmlgrid-charisma.git/commitdiff/4b38dae306ebf465b48b6ce790b8711332493f38
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
