use rpm5 compatible noautoreq patterns

[packages/php-phpmailer.git] / php-phpmailer.spec

diff --git a/php-phpmailer.spec b/php-phpmailer.spec
index 9099415dca7d2e4c9f237f21b81b621ccaa852ea..dbbecf1abc5f7b6fbd877eba71d6b978a1e1efb9 100644 (file)
--- a/php-phpmailer.spec
+++ b/php-phpmailer.spec
@@ -1,27 +1,25 @@
 %define                pkgname phpmailer
 %define                php_min_version 5.2.0
-%define                subver  beta1
 %include       /usr/lib/rpm/macros.php
 Summary:       Full featured email transfer class for PHP
 Summary(pl.UTF-8):     W pełni funkcjonalna klasa PHP do przesyłania e-maili
 Name:          php-%{pkgname}
 Version:       5.2.2
-Release:       0.%{subver}.2
+Release:       2
 License:       LGPL v2.1
 Group:         Development/Languages/PHP
-#Source0:      http://phpmailer.apache-extras.org.codespot.com/files/PHPMailer_%{version}.tgz
-Source0:       http://phpmailer.apache-extras.org.codespot.com/files/PHPMailer_%{version}-%{subver}.tgz
-# Source0-md5: 67bbd48cb35ed070c636b7ad67daaca1
+Source0:       http://phpmailer.apache-extras.org.codespot.com/files/PHPMailer_%{version}.tgz
+# Source0-md5: 8c4b4a76641edfc89e3f3424da649b62
 Patch0:                paths.patch
 URL:           http://code.google.com/a/apache-extras.org/p/phpmailer/
-BuildRequires: php-pear-PhpDocumentor
+#BuildRequires:        php-pear-PhpDocumentor
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
-BuildRequires: rpmbuild(macros) >= 1.553
-Requires:      php-common >= 4:%{php_min_version}
-Requires:      php-date
-Requires:      php-pcre
-Suggests:      php-mbstring
-Suggests:      php-openssl
+BuildRequires: rpmbuild(macros) >= 1.654
+Requires:      php(core) >= %{php_min_version}
+Requires:      php(date)
+Requires:      php(pcre)
+Suggests:      php(mbstring)
+Suggests:      php(openssl)
 Obsoletes:     phpmailer
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,10 +31,10 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _noautophp      php-openssl php-mbstring php-filter
 
 # bad depsolver
-%define                _noautopear     pear(ntlm_sasl_client.php)
+%define                _noautoreq_pear ntlm_sasl_client.php
 
 # put it together for rpmbuild
-%define                _noautoreq      %{?_noautophp} %{?_noautopear}
+%define                _noautoreq      %{?_noautophp}
 
 %description
 PHP email transport class featuring multiple file attachments, SMTP
@@ -137,6 +135,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(pt_BR) %{_appdir}/language/phpmailer.lang-br.php
 %lang(ro) %{_appdir}/language/phpmailer.lang-ro.php
 %lang(ru) %{_appdir}/language/phpmailer.lang-ru.php
+%lang(sk) %{_appdir}/language/phpmailer.lang-sk.php
 %lang(sv) %{_appdir}/language/phpmailer.lang-se.php
 %lang(tr) %{_appdir}/language/phpmailer.lang-tr.php
 %lang(zh) %{_appdir}/language/phpmailer.lang-zh.php