[packages/bacula-web] Revert "- migrate to apache 2.4"
glen
glen at pld-linux.org
Thu Sep 26 22:57:34 CEST 2013
commit 2f6c9c51834fddf1301e098415486fa4b79332cc
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Sep 26 23:55:14 2013 +0300
Revert "- migrate to apache 2.4"
This reverts commit cf69a54adaff5b24c8e3be32a5df0aa96949e000.
bacula-web.spec | 8 +++-----
httpd.conf | 13 -------------
2 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/bacula-web.spec b/bacula-web.spec
index 59a77c4..48302bb 100644
--- a/bacula-web.spec
+++ b/bacula-web.spec
@@ -11,7 +11,6 @@ Group: Applications/WWW
Source0: http://www.bacula-web.org/tl_files/downloads/%{name}-%{version}.tar.gz
# Source0-md5: 6d3d212a9d145f8d112ce15f5a40538d
Source1: apache.conf
-Source2: httpd.conf
Patch0: sys-libs.patch
URL: http://www.bacula-web.org/
BuildRequires: rpm-php-pearprov >= 4.4.2-11
@@ -30,7 +29,6 @@ Requires: webserver(php)
Suggests: php-pdo-mysql
Suggests: php-pdo-pgsql
Suggests: php-pdo-sqlite
-Conflicts: apache-base < 2.4.0-1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -73,7 +71,7 @@ cp -a *.php application core $RPM_BUILD_ROOT%{_appdir}
cp -a config/* $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -93,10 +91,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
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index 688e903..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-Alias /bacula-web/cache/ /var/cache/bacula-web/
-Alias /bacula-web /usr/share/bacula-web
-
-<Directory /usr/share/bacula-web>
- Require all granted
-</Directory>
-
-<Directory /var/cache/bacula-web>
- Require all denied
- <Files *.png>
- Require all granted
- </Files>
-</Directory>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bacula-web.git/commitdiff/5fb85618f7a250fa0513f532432fbd2d76d18704
More information about the pld-cvs-commit
mailing list