[php-PHPMailer/el6] Fix previously commited merge issue

[trasher]

commit 7a3a69904711a80324dd0a7615ce5a5b9c9c320d
Author: trasher <trasher at fedoraproject.org>
Date:   Thu Mar 22 19:06:25 2012 +0100

    Fix previously commited merge issue

 php-PHPMailer.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/php-PHPMailer.spec b/php-PHPMailer.spec
index 8ea57b9..91fabe9 100644
--- a/php-PHPMailer.spec
+++ b/php-PHPMailer.spec
@@ -1,7 +1,7 @@
 Name:		php-PHPMailer
 Summary:	PHP email transport class with a lot of features
 Version:	5.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 Source0:	http://phpmailer.apache-extras.org.codespot.com/files/PHPMailer_%{version}.tgz
@@ -41,7 +41,6 @@ Full Featured Email Transfer Class for PHP. PHPMailer features:
 %setup -q -n PHPMailer_%{version}
 
 %patch1 -p 1
-%patch2 -p 1
 
 
 #-------------------------------------------------------------------------------
@@ -114,6 +113,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 
 %changelog
+* Thu Mar 22 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 5.2.1-2
+- Rebuilt after commited merge issue
+
 * Tue Mar 20 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 5.2.1-1
 - Latest upstream release