[php-PHPMailer] Upgrade to 5.2.2

Johan Cwiklinski trasher at fedoraproject.org
Sun Dec 23 13:34:03 UTC 2012


commit 536e372b78c0ef95d97f05bf91c087b25581bbb9
Author: Johan Cwiklinski <johan at x-tnd.be>
Date:   Sun Dec 23 14:35:37 2012 +0100

    Upgrade to 5.2.2

 .gitignore                  |    1 +
 PHPMailer-5.2.1-php53.patch |  105 -------------------------------------------
 php-PHPMailer.spec          |   28 ++++++++++--
 sources                     |    2 +-
 4 files changed, 26 insertions(+), 110 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d6117f8..2e13152 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 PHPMailer_v5.1.tar.gz
 /PHPMailer_5.2.1.tgz
+/PHPMailer_5.2.2.tgz
diff --git a/php-PHPMailer.spec b/php-PHPMailer.spec
index 50e6349..ce0f7dd 100644
--- a/php-PHPMailer.spec
+++ b/php-PHPMailer.spec
@@ -1,11 +1,10 @@
 Name:		php-PHPMailer
 Summary:	PHP email transport class with a lot of features
-Version:	5.2.1
-Release:	2%{?dist}
+Version:	5.2.2
+Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 Source0:	http://phpmailer.apache-extras.org.codespot.com/files/PHPMailer_%{version}.tgz
-Patch1:		PHPMailer-5.2.1-php53.patch
 URL:		http://phpmailer.worxware.com/
 Requires:	php-mbstring >= 5.1.0
 Buildarch:	noarch
@@ -40,7 +39,25 @@ Full Featured Email Transfer Class for PHP. PHPMailer features:
 
 %setup -q -n PHPMailer_%{version}
 
-%patch1 -p 1
+pushd docs/phpdoc/js/prettify
+
+NONUTF="lang-apollo.js
+lang-vb.js
+lang-tex.js
+lang-vhdl.js
+lang-scala.js
+lang-lua.js
+lang-ml.js
+lang-wiki.js
+lang-sql.js
+lang-go.js" 
+
+for file in $NONUTF
+do
+	iconv -f iso-8859-1 -t utf-8 $file > $file.utf
+	mv $file.utf $file
+done
+popd
 
 
 #-------------------------------------------------------------------------------
@@ -113,6 +130,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 
 %changelog
+* Sun Dec 23 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 5.2.2-1
+- Latest upstream release
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 7cf0739..2e64099 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ef9a089aa9aae9899b4ab785ef873c3  PHPMailer_5.2.1.tgz
+8c4b4a76641edfc89e3f3424da649b62  PHPMailer_5.2.2.tgz


More information about the scm-commits mailing list