Revert "- migrate to apache 2.4"

This reverts commit 470913d87e20d81dffd03873bb51a0da32c877e9.

diff --git a/ckfinder.spec b/ckfinder.spec
index 96bbd4d9ae0be7df7bc0f040fafcf3f17d0fb92a..a3cc9a85cbb4234ae66c27df321cdd05588400de 100644 (file)
--- a/ckfinder.spec
+++ b/ckfinder.spec
@@ -2,7 +2,7 @@ Summary:        AJAX file manager for web browsers
 Summary(pl.UTF-8):     Edytor tekstowy dla Internetu
 Name:          ckfinder
 Version:       1.4.2
-Release:       3
+Release:       2
 License:       Custom
 Group:         Applications/WWW
 Source0:       http://download.cksource.com/CKFinder/CKFinder%20for%20PHP/%{version}/%{name}_php_%{version}.tar.gz
@@ -14,7 +14,6 @@ Patch2:               config.patch
 Source1:       find-lang.sh
 Source2:       apache.conf
 Source3:       lighttpd.conf
-Source4:       httpd.conf
 BuildRequires: rpmbuild(macros) >= 1.565
 BuildRequires: sed >= 4.0
 #Requires:     php-gd
@@ -22,7 +21,6 @@ Requires:     webapps
 Requires:      webserver
 Requires:      webserver(access)
 Requires:      webserver(alias)
-Conflicts:     apache-base < 2.4.0-1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -94,7 +92,7 @@ cp -a config.php $RPM_BUILD_ROOT%{_sysconfdir}
 cp -a ckfinder.php $RPM_BUILD_ROOT%{php_data_dir}
 
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -108,10 +106,10 @@ cp -a _samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %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/httpd.conf b/httpd.conf
deleted file mode 100644 (file)
index 30c359d..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-Alias /ckfinder/userfiles/ /var/lib/ckfinder/
-Alias /ckfinder/ /usr/share/ckfinder/
-
-<Directory /usr/share/ckfinder>
-       Require all granted
-</Directory>
-
-<Directory /var/lib/ckfinder>
-       Require all granted
-       <IfModule mod_php5.c>
-               php_value engine off
-       </IfModule>
-       <IfModule mod_php4.c>
-               php_value engine off
-       </IfModule>
-</Directory>