packages: php-phpmailer/php-phpmailer.spec, php-phpmailer/tests.patch (NEW)...

[glen]

Author: glen                         Date: Sun Apr 22 11:57:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixup testing; cosmetics

---- Files affected:
packages/php-phpmailer:
   php-phpmailer.spec (1.19 -> 1.20) , tests.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-phpmailer/php-phpmailer.spec
diff -u packages/php-phpmailer/php-phpmailer.spec:1.19 packages/php-phpmailer/php-phpmailer.spec:1.20
--- packages/php-phpmailer/php-phpmailer.spec:1.19	Thu Apr 19 22:28:08 2012
+++ packages/php-phpmailer/php-phpmailer.spec	Sun Apr 22 13:57:21 2012
@@ -12,9 +12,10 @@
 # Source0-md5:	2ef9a089aa9aae9899b4ab785ef873c3
 Patch0:		paths.patch
 Patch1:		phpmailer-update-et.patch
+Patch2:		tests.patch
 URL:		http://code.google.com/a/apache-extras.org/p/phpmailer/
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
-BuildRequires:	rpmbuild(macros) >= 1.520
+BuildRequires:	rpmbuild(macros) >= 1.553
 Requires:	php-common >= 4:%{php_min_version}
 Requires:	php-date
 Requires:	php-pcre
@@ -48,19 +49,19 @@
 %setup -q -n PHPMailer_%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
-find '(' -name '*.php' -o -name '*.html' -o -name '*.txt' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
-%{__sed} -i -e 's,\r$,,' README LICENSE
+%undos -f php,html,txt README LICENSE
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_appdir}/language
 
-cp -a class.phpmailer.php $RPM_BUILD_ROOT%{php_data_dir}
+cp -p class.phpmailer.php $RPM_BUILD_ROOT%{php_data_dir}
 # plugins: for smtp and pop before smtp auth
-cp -a class.{smtp,pop3}.php  $RPM_BUILD_ROOT%{_appdir}
+cp -p class.{smtp,pop3}.php  $RPM_BUILD_ROOT%{_appdir}
 # language: translations of error messages
-cp -a language/*.php $RPM_BUILD_ROOT%{_appdir}/language
+cp -p language/*.php $RPM_BUILD_ROOT%{_appdir}/language
 
 # examples
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -111,6 +112,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2012/04/22 11:57:21  glen
+- fixup testing; cosmetics
+
 Revision 1.19  2012/04/19 20:28:08  glen
 - up to 5.2.1
 

================================================================
Index: packages/php-phpmailer/tests.patch
diff -u /dev/null packages/php-phpmailer/tests.patch:1.1
--- /dev/null	Sun Apr 22 13:57:26 2012
+++ packages/php-phpmailer/tests.patch	Sun Apr 22 13:57:21 2012
@@ -0,0 +1,27 @@
+--- PHPMailer_5.2.1/test/phpmailerTest.php~	2012-04-22 14:55:00.201857103 +0300
++++ PHPMailer_5.2.1/test/phpmailerTest.php	2012-04-22 14:54:00.232668489 +0300
+@@ -13,7 +13,6 @@
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ */
+ 
+-require 'PHPUnit/Framework.php';
+ 
+ $INCLUDE_DIR = "../";
+ 
+@@ -146,7 +145,7 @@
+         $ReportBody .= "---------------------" . $eol;
+         $ReportBody .= "Unit Test Information" . $eol;
+         $ReportBody .= "---------------------" . $eol;
+-        $ReportBody .= "phpmailer version: " . PHPMailer::VERSION . $eol;
++        $ReportBody .= "phpmailer version: " . $this->Mail->Version . $eol;
+         $ReportBody .= "Content Type: " . $this->Mail->ContentType . $eol;
+         
+         if(strlen($this->Mail->Host) > 0)
+@@ -637,7 +636,6 @@
+ 	    $this->Mail->CreateHeader();
+ 	    $this->assertFalse($this->Mail->set('x', 'y'), 'Invalid property set succeeded');
+ 	    $this->assertTrue($this->Mail->set('Timeout', 11), 'Valid property set failed');
+-	    $this->Mail->getFile(__FILE__);
+ 	}
+ }  
+  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/php-phpmailer/php-phpmailer.spec?r1=1.19&r2=1.20