rpms/php-PHPMailer/EL-6 php-PHPMailer.spec,1.1,1.2 sources,1.2,1.3

[Remi Collet]

Author: remi

Update of /cvs/pkgs/rpms/php-PHPMailer/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13555

Modified Files:
	php-PHPMailer.spec sources 
Log Message:
update to latest rawhide improvments (for PHP 5.3)


Index: php-PHPMailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/EL-6/php-PHPMailer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-PHPMailer.spec	5 Aug 2009 09:36:07 -0000	1.1
+++ php-PHPMailer.spec	11 Jul 2010 10:23:10 -0000	1.2
@@ -1,15 +1,14 @@
 Name:		php-PHPMailer
 Summary:	PHP email transport class with a lot of features
-Version:	5.0.2
-Release:	3%{?dist}
+Version:	5.1
+Release:	2%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 Source0:	http://downloads.sourceforge.net/phpmailer/PHPMailer_v%{version}.tar.gz
+Patch1:		PHPMailer-5.1-php53.patch
 URL:		http://phpmailer.worxware.com/
 Requires:	php-mbstring >= 5.1.0
-BuildRequires:	dos2unix
 Buildarch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Full Featured Email Transfer Class for PHP. PHPMailer features:
@@ -41,9 +40,16 @@ Full Featured Email Transfer Class for P
 
 %setup -q -n PHPMailer_v%{version}
 
-#	Make sure all files are \n terminated.
+%patch1 -p 1
 
-find . -type f | xargs dos2unix
+
+#-------------------------------------------------------------------------------
+%build
+#-------------------------------------------------------------------------------
+
+#	Make sure all file lines are \n terminated.
+
+find . -type f -exec sed -i -e 's/[\r\t ]*$//' '{}' ';'
 
 #	Change default language path.
 
@@ -53,13 +59,6 @@ sed -i -e								\
 
 
 #-------------------------------------------------------------------------------
-%build
-#-------------------------------------------------------------------------------
-
-#	Nothing to do.
-
-
-#-------------------------------------------------------------------------------
 %install
 #-------------------------------------------------------------------------------
 
@@ -106,7 +105,7 @@ rm -rf "${RPM_BUILD_ROOT}"
 #-------------------------------------------------------------------------------
 
 %defattr(-, root, root, -)
-%doc docs/* README LICENSE ChangeLog.txt
+%doc docs/* README LICENSE changelog.txt
 %doc examples
 %{_datadir}/php/PHPMailer
 %dir %{_datadir}/PHPMailer
@@ -117,6 +116,15 @@ rm -rf "${RPM_BUILD_ROOT}"
 %changelog
 #-------------------------------------------------------------------------------
 
+* Thu Jul  8 2010 Patrick Monnerat <pm at datasphere.ch> 5.1-2
+- Get rid of dos2unix build requirement and of BuildRoot rpm tag.
+
+* Fri Jan 15 2010 Patrick Monnerat <pm at datasphere.ch> 5.1-1
+- New upstream release.
+- Moved endline conversion and default language path update from prep to
+  build section.
+- Patch "php53" to remove PHP 5.3 deprecated features.
+
 * Mon Aug  3 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-3
 - Home page change.
 - Package description from new home page.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	5 Aug 2009 09:36:07 -0000	1.2
+++ sources	11 Jul 2010 10:23:10 -0000	1.3
@@ -1 +1 @@
-2f7296bb63e863c5528c2d591e38f4e5  PHPMailer_v5.0.2.tar.gz
+6e81fc229f88f7d9dd7cf70d65296ef8  PHPMailer_v5.1.tar.gz