up to 5.2.2 release

diff --combined php-phpmailer.spec
index 90d2dce89d268b6bd649d5d9a5f5e69e7c2a82a6,b0a5d2be3d9373003de2a9330ed119cb4fecd62b..89769f5b25c6a67921a1e8376c59deb34e0fb044
--- 1/php-phpmailer.spec
--- 2/php-phpmailer.spec
+++ b/php-phpmailer.spec
@@@ -4,22 -4,20 +4,20 @@@
  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.1
- Release:      4
+ Version:      5.2.2
+ Release:      1
  License:      LGPL v2.1
  Group:                Development/Languages/PHP
  Source0:      http://phpmailer.apache-extras.org.codespot.com/files/PHPMailer_%{version}.tgz
- # Source0-md5:        2ef9a089aa9aae9899b4ab785ef873c3
+ # Source0-md5:        8c4b4a76641edfc89e3f3424da649b62
  Patch0:               paths.patch
- Patch1:               phpmailer-update-et.patch
- Patch2:               tests.patch
  URL:          http://code.google.com/a/apache-extras.org/p/phpmailer/
  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(core) >= %{php_min_version}
 +Requires:     php(pcre)
  Requires:     php-date
 -Requires:     php-pcre
  Suggests:     php-mbstring
  Suggests:     php-openssl
  Obsoletes:    phpmailer
@@@ -32,6 -30,9 +30,9 @@@ BuildRoot:    %{tmpdir}/%{name}-%{version}
  # exclude optional php dependencies
  %define               _noautophp      php-openssl php-mbstring php-filter
  
+ # bad depsolver
+ %define               _noautopear     pear(ntlm_sasl_client.php)
+ 
  # put it together for rpmbuild
  %define               _noautoreq      %{?_noautophp} %{?_noautopear}
  
@@@ -60,15 -61,14 +61,14 @@@ Documentation for %{name}
  Dokumentacja do %{name}.
  
  %prep
- %setup -q -n PHPMailer_%{version}
+ %setup -q -n PHPMailer_%{version}%{?subver:-%{subver}}
  %patch0 -p1
- %patch1 -p1
- %patch2 -p1
  
  %undos -f php,html,txt README LICENSE
  
- mv docs/5.0-phpdocs phpdoc.orig
+ mv docs/phpdoc .
  
+ %if 0
  %build
  phpdoc --title 'PHPMailer version %{version}' --target phpdoc --defaultpackagename PHPMailer -f 'class.*.php'
  # nuke smarty cache
@@@ -80,6 -80,7 +80,7 @@@ sdir=%{php_pear_dir}/data/PhpDocumentor
  install -d phpdoc/media/images
  cp -a $sdir/Constant.png phpdoc/media/images
  cp -a $sdir/Variable.png phpdoc/media/images
+ %endif
  
  %install
  rm -rf $RPM_BUILD_ROOT
@@@ -91,7 -92,7 +92,7 @@@ cp -p class.{smtp,pop3}.php  $RPM_BUILD
  # language: translations of error messages
  cp -p language/*.php $RPM_BUILD_ROOT%{_appdir}/language
  
- # extras: htmlfilter.php
+ # extras: htmlfilter.php, ntlm_sasl_client.php
  cp -a extras $RPM_BUILD_ROOT%{_appdir}
  
  # examples
@@@ -134,13 -135,16 +135,16 @@@ rm -rf $RPM_BUILD_ROO
  %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
  %lang(zh_CN) %{_appdir}/language/phpmailer.lang-zh_cn.php
  
  %dir %{_appdir}/extras
+ %{_appdir}/extras/class.html2text.inc
  %{_appdir}/extras/htmlfilter.php
+ %{_appdir}/extras/ntlm_sasl_client.php
  
  %{_examplesdir}/%{name}-%{version}