- Mail dir in php-pear; rel 6

Changed files:
    php-pear-Mail_IMAP.spec -> 1.26

diff --git a/php-pear-Mail_IMAP.spec b/php-pear-Mail_IMAP.spec
index f687af57a0d078dcf20336da5369e39106c6957e..31b488ca4ece1792f40f48bc0367ad9e8c45bc39 100644 (file)
--- a/php-pear-Mail_IMAP.spec
+++ b/php-pear-Mail_IMAP.spec
@@ -1,10 +1,8 @@
 %include       /usr/lib/rpm/macros.php
-%define                _class          Mail
-%define                _subclass       IMAP
 %define                _status         beta
-%define                _pearname       %{_class}_%{_subclass}
+%define                _pearname       Mail_IMAP
 %define                subver RC2
-%define                rel 5
+%define                rel 6
 Summary:       %{_pearname} - a c-client webmail backend
 Summary(pl.UTF-8):     %{_pearname} - backend webmaila oparty o bibliotekę c-client
 Name:          php-pear-%{_pearname}
@@ -17,9 +15,9 @@ Source0:      http://pear.php.net/get/%{_pearname}-%{version}%{subver}.tgz
 URL:           http://pear.php.net/package/Mail_IMAP/
 BuildRequires: php-pear-PEAR
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
-BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: rpmbuild(macros) >= 1.571
 Requires:      php-imap
-Requires:      php-pear
+Requires:      php-pear >= 4:1.3-6
 Suggests:      php-pear-Net_URL
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,13 +52,11 @@ install -d $RPM_BUILD_ROOT%{php_pear_dir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
-       cat %{_docdir}/%{name}-%{version}/optional-packages.txt
-fi
+%post -p <lua>
+%pear_package_print_optionalpackages
 
 %files
 %defattr(644,root,root,755)
 %doc install.log optional-packages.txt
 %{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/%{_class}/*.php
+%{php_pear_dir}/Mail/IMAP.php