- updated to 4.0.6

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index a573d307060416864b8701f968a90b663764871b..5ef62439a0b3418b6f1aac732d66389c7a7a691f 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -4,20 +4,22 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):     phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       4.0.0
+Version:       4.0.6
 Release:       1
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
-Source0:       http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
-# Source0-md5: 42ab4ee21915687753861699635d2bde
-Source1:       %{name}.conf
+Source0:       http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
+# Source0-md5: 646795297032cc9d53fe9bee261919e5
+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
 URL:           http://www.phpmyadmin.net/
 BuildRequires: rpmbuild(macros) >= 1.268
-Requires(triggerpostun):       sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires:      php(core) >= 5.2
 Requires:      php(ctype)
 Requires:      php(filter)
@@ -31,9 +33,11 @@ Requires:    php(simplexml)
 Requires:      webapps
 Requires:      webserver(access)
 Requires:      webserver(alias)
+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)
 
@@ -96,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 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
@@ -108,10 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd