Revert "- migrated to apache 2.4"

This reverts commit 483a1aa6ef4339f714a36ab887bfe7e935bdabf1.

Conflicts:
	phpMyAdmin.spec

diff --git a/phpMyAdmin-httpd.conf b/phpMyAdmin-httpd.conf
deleted file mode 100644 (file)
index bae0e7d..0000000
--- a/phpMyAdmin-httpd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-Alias /myadmin /usr/share/phpMyAdmin
-<Directory "/usr/share/phpMyAdmin">
-       Options FollowSymLinks
-       AllowOverride None
-       Require all granted
-       # uncomment if using apache-mod_php
-       #php_admin_value open_basedir "/etc/webapps/phpMyAdmin/:/usr/share/phpMyAdmin/:/usr/share/phpMyAdmin/css/..:/tmp"
-</Directory>

diff --git a/phpMyAdmin-apache.conf b/phpMyAdmin.conf
similarity index 100%
rename from phpMyAdmin-apache.conf
rename to phpMyAdmin.conf

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 1d4fbdfcec76758430ea2d7a52ea14173bb4c679..f8af80eea9a269dacaaa2aed88fc438c1313a3ee 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -12,7 +12,6 @@ Source0:      http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-lang
 # Source0-md5: 2f34f35824f7189822ca2a9f1ccc55ce
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
-Source3:       %{name}-httpd.conf
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-ServerSelectDisplayName.patch
 Patch2:                %{name}-ServerSelectDisplayName-config.patch
@@ -39,7 +38,6 @@ Requires(triggerpostun):      sed >= 4.0
 Suggests:      php-mysqli
 Suggests:      webserver(indexfile)
 Suggests:      webserver(php)
-Conflicts:     apache-base < 2.4.0-1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -102,7 +100,7 @@ install libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.ph
 ln -sf %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -114,10 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %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