rpms/php-PHPMailer/devel php-PHPMailer.spec,1.2,1.3

Patrick Monnerat monnerat at fedoraproject.org
Thu Jul 8 15:58:47 UTC 2010


Author: monnerat

Update of /cvs/pkgs/rpms/php-PHPMailer/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19560

Modified Files:
	php-PHPMailer.spec 
Log Message:

* Thu Jul  8 2010 Patrick Monnerat <pm at datasphere.ch> 5.1-2
- Get rid of dos2unix build requirement and of BuildRoot rpm tag.



Index: php-PHPMailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/devel/php-PHPMailer.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-PHPMailer.spec	18 Jan 2010 18:12:27 -0000	1.2
+++ php-PHPMailer.spec	8 Jul 2010 15:58:47 -0000	1.3
@@ -1,16 +1,14 @@
 Name:		php-PHPMailer
 Summary:	PHP email transport class with a lot of features
 Version:	5.1
-Release:	1%{?dist}
+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:
@@ -49,9 +47,9 @@ Full Featured Email Transfer Class for P
 %build
 #-------------------------------------------------------------------------------
 
-#	Make sure all files are \n terminated.
+#	Make sure all file lines are \n terminated.
 
-find . -type f | xargs dos2unix
+find . -type f -exec sed -i -e 's/[\r\t ]*$//' '{}' ';'
 
 #	Change default language path.
 
@@ -118,6 +116,9 @@ 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



More information about the scm-commits mailing list