apache 2.2/2.4 compatible config

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 5b18d7851b9fe0c3e6f2274d9bfb22154d93e1d6..012cb6c2e18a3f5f556a24c987ef0b61f590809a 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -4,15 +4,14 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):     phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       4.0.8
-Release:       1
+Version:       4.1.6
+Release:       2
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
 Source0:       http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
-# Source0-md5: c99d13b84b57bd1d97149a60f775bb4e
-Source1:       %{name}-apache.conf
+# Source0-md5: 2f34f35824f7189822ca2a9f1ccc55ce
+Source1:       apache.conf
 Source2:       %{name}-lighttpd.conf
-Source3:       %{name}-httpd.conf
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-ServerSelectDisplayName.patch
 Patch2:                %{name}-ServerSelectDisplayName-config.patch
@@ -20,7 +19,9 @@ URL:          http://www.phpmyadmin.net/
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Requires:      php(core) >= 5.2
+# phpMyAdmin doesn't support mysql < 5.5 and won't work with php < 5.3
+Requires:      mysql-libs >= 5.5
+Requires:      php(core) >= 5.3
 Requires:      php(ctype)
 Requires:      php(filter)
 Requires:      php(json)
@@ -37,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)
 
@@ -93,15 +93,15 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
-install *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
+cp -p *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
 cp -a locale themes js libraries $RPM_BUILD_ROOT%{_appdir}
 
-install libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
+cp -p libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
 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 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,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
@@ -126,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README
+%doc ChangeLog README examples
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf