[php-PHPMailer/el6: 9/9] Merge branch 'master' into el6

[trasher]

commit d483ecee17d1c34d092ff84ddf4298f3ae0db429
Merge: ce5d487 81a54ca
Author: trasher <trasher at fedoraproject.org>
Date:   Thu Mar 22 18:42:27 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	php-PHPMailer.spec
    	sources

 .gitignore                  |    2 +-
 PHPMailer-5.2.1-php53.patch |  105 +++++++++++++++++++++++++++++++++++++++++++
 php-PHPMailer.spec          |   15 +++---
 sources                     |    2 +-
 4 files changed, 114 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index e6e30a4,d6117f8..6dd6c69
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,2 @@@
 -PHPMailer_v5.1.tar.gz
 -/PHPMailer_5.2.1.tgz
 +*~
- PHPMailer_v5.0.2.tar.gz
++PHPMailer_5.2.1.tar.gz
diff --cc php-PHPMailer.spec
index 449128b,fd1aec9..8ea57b9
--- a/php-PHPMailer.spec
+++ b/php-PHPMailer.spec
@@@ -39,10 -38,9 +38,10 @@@ Full Featured Email Transfer Class for 
  %prep
  #-------------------------------------------------------------------------------
  
- %setup -q -n PHPMailer_v%{version}
+ %setup -q -n PHPMailer_%{version}
  
  %patch1 -p 1
 +%patch2 -p 1
  
  
  #-------------------------------------------------------------------------------
@@@ -114,12 -112,12 +113,12 @@@ rm -rf "${RPM_BUILD_ROOT}
  %dir %{_datadir}/PHPMailer/language
  
  
- #-------------------------------------------------------------------------------
  %changelog
- #-------------------------------------------------------------------------------
+ * Tue Mar 20 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 5.2.1-1
+ - Latest upstream release
  
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +* Thu Jul 21 2011 Remi Collet <remi at fedoraproject.org> 5.1-4.el6
 +- latest change from rawhide (sign patch)
  
  * Mon Jul 18 2011 Patrick Monnerat <pm at datasphere.ch> 5.1-4
  - Patch "sign" to fix mail signing.