- rel 2: use php(extension) virtuals

[packages/phpMyAdmin.git] / phpMyAdmin.spec

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index d1b7635edd04edafc024978c04cfb128f8a702a8..0373f25badca2864ff05890266d5b3f5f90edc38 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,26 +1,27 @@
 Summary:       phpMyAdmin - web-based MySQL administration
 Summary(pl):   phpMyAdmin - administracja bazami MySQL przez WWW
 Name:          phpMyAdmin
-Version:       2.8.1
-Release:       1
+Version:       2.9.1.1
+Release:       2
 License:       GPL v2
 Group:         Applications/Databases/Interfaces
-Source0:       http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}.tar.bz2
-# Source0-md5: 82d7ed4a71608fd7eeef5510c4a49056
+Source0:       http://dl.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.bz2
+# Source0-md5: 954675b5da3f33c2d53ae4b5096dbb0e
 Source1:       %{name}.conf
 Patch0:                %{name}-config.patch
 URL:           http://www.phpmyadmin.net/
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       sed >= 4.0
-Requires:      php
-Requires:      php-mysql
-Requires:      php-pcre
+Requires:      php(mysql)
+Requires:      php(pcre)
 Requires:      webapps
+Requires:      webserver(access)
+Requires:      webserver(php)
 #Suggests:     php-mbstring
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _appdir %{_datadir}/%{name}
+%define                _appdir         %{_datadir}/%{name}
 %define                _webapps        /etc/webapps
 %define                _webapp         %{name}
 %define                _sysconfdir     %{_webapps}/%{_webapp}
@@ -60,8 +61,8 @@ podr
 - tworzyæ i czytaæ zrzuty tabel
 
 %prep
-%setup -q
-%patch -p1
+%setup -q -n %{name}-%{version}-all-languages
+%patch0 -p0
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,10 +93,10 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- apache1
+%triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
-%triggerun -- apache1
+%triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
 %triggerin -- apache < 2.2.0, apache-base