- up to 2.3, apidocs accessible over web only

Changed files:
    paths.patch -> 1.1
    php-phpmailer.spec -> 1.13

diff --git a/paths.patch b/paths.patch
new file mode 100644 (file)
index 0000000..6ed10ff
--- /dev/null
+++ b/paths.patch
@@ -0,0 +1,20 @@
+--- phpMailer_v2.3/class.phpmailer.php~        2010-01-12 16:05:45.000000000 +0200
++++ phpMailer_v2.3/class.phpmailer.php 2010-01-12 16:05:46.997539898 +0200
+@@ -134,7 +134,7 @@
+    * is in a different directory than the PHP include path.
+    * @var string
+    */
+-  public $PluginDir         = '';
++  public $PluginDir         = '/usr/share/php/phpmail/';
+ 
+   /**
+    * Holds PHPMailer version.
+@@ -663,7 +663,7 @@
+    * @access public
+    * @return bool
+    */
+-  function SetLanguage($lang_type = 'en', $lang_path = 'language/') {
++  function SetLanguage($lang_type = 'en', $lang_path = '/usr/share/php/phpmailer/language/') {
+     if( !(@include $lang_path.'phpmailer.lang-'.$lang_type.'.php') ) {
+       $PHPMAILER_LANG = array();
+       $PHPMAILER_LANG["provide_address"]      = 'You must provide at least one ' .

diff --git a/php-phpmailer.spec b/php-phpmailer.spec
index 9b6e897164cf5e5b347f55320c2231570708baa7..56f71495db4e58d4d60a4ad68d3a8bea6e17c78c 100644 (file)
--- a/php-phpmailer.spec
+++ b/php-phpmailer.spec
@@ -3,23 +3,21 @@
 Summary:       Full featured email transfer class for PHP
 Summary(pl.UTF-8):     W pełni funkcjonalna klasa PHP do przesyłania e-maili
 Name:          php-phpmailer
-Version:       2.2.1
+Version:       2.3
 Release:       1
 License:       LGPL
 Group:         Development/Languages/PHP
-Source0:       http://dl.sourceforge.net/phpmailer/phpMailer_v%{version}_.tar.gz
-# Source0-md5: 0bf75c1bcef8bde6adbebcdc69f1a02d
+Source0:       http://dl.sourceforge.net/phpmailer/phpMailer_v%{version}.tar.gz
+# Source0-md5: 897f53ab746c48f372364b7745d8d468
 URL:           http://phpmailer.codeworxtech.com/
 BuildRequires: rpmbuild(macros) >= 1.461
 Requires:      php-common >= 4:5.0
-Obsoletes:     php-phpmailer
+Obsoletes:     phpmailer
+Patch0:                paths.patch
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# _phpdocdir / php_docdir / phpdoc_dir ?
-%define                _phpdocdir              %{_docdir}/phpdoc
-
-%define                _appdir                 %{php_data_dir}/phpmailer
+%define                _appdir         %{php_data_dir}/phpmailer
 
 %description
 PHP email transport class featuring multiple file attachments, SMTP
@@ -33,30 +31,24 @@ plikowych, serwery SMTP, CC, BCC, wiadomości HTML, zawijanie linii
 itp. Potrafi wysyłać pocztę przez sendmaila, funkcją PHP mail() albo
 poprzez SMTP. Metody są oparte na popularnym komponencie AspEmail.
 
-%package phpdoc
-Summary:       Online manual for phpMailer
-Summary(pl.UTF-8):     Dokumentacja online do phpMailer
-Group:         Documentation
-Requires:      php-dirs
-
-%description phpdoc
-Documentation for phpMailer.
-
-%description phpdoc -l pl.UTF-8
-Dokumentacja do phpMailer.
-
 %prep
-%setup -q -c
+%setup -q -n phpMailer_v%{version}
+%patch0 -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
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdir}/language,%{_phpdocdir}/phpmailer}
+install -d $RPM_BUILD_ROOT%{_appdir}/language
 
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
+cp -a 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}
+# language: translations of error messages
 cp -a language/*.php $RPM_BUILD_ROOT%{_appdir}/language
-cp -a phpdoc/* $RPM_BUILD_ROOT%{_phpdocdir}/phpmailer
+
+# examples
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -66,18 +58,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog.txt README LICENSE docs/*
+%{php_data_dir}/class.phpmailer.php
+
 %dir %{_appdir}
-%{_appdir}/class.phpmailer.php
 %{_appdir}/class.pop3.php
 %{_appdir}/class.smtp.php
-
 %dir %{_appdir}/language
 %{_appdir}/language/phpmailer.lang-en.php
-%lang(pt_BR) %{_appdir}/language/phpmailer.lang-br.php
+%lang(ar) %{_appdir}/language/phpmailer.lang-ar.php
 %lang(ca) %{_appdir}/language/phpmailer.lang-ca.php
 %lang(cs) %{_appdir}/language/phpmailer.lang-cz.php
-%lang(de) %{_appdir}/language/phpmailer.lang-de.php
 %lang(da) %{_appdir}/language/phpmailer.lang-dk.php
+%lang(de) %{_appdir}/language/phpmailer.lang-de.php
 %lang(es) %{_appdir}/language/phpmailer.lang-es.php
 %lang(et) %{_appdir}/language/phpmailer.lang-et.php
 %lang(fi) %{_appdir}/language/phpmailer.lang-fi.php
@@ -86,16 +78,13 @@ rm -rf $RPM_BUILD_ROOT
 %lang(hu) %{_appdir}/language/phpmailer.lang-hu.php
 %lang(it) %{_appdir}/language/phpmailer.lang-it.php
 %lang(ja) %{_appdir}/language/phpmailer.lang-ja.php
-%lang(nl) %{_appdir}/language/phpmailer.lang-nl.php
 %lang(nb) %{_appdir}/language/phpmailer.lang-no.php
+%lang(nl) %{_appdir}/language/phpmailer.lang-nl.php
 %lang(pl) %{_appdir}/language/phpmailer.lang-pl.php
+%lang(pt_BR) %{_appdir}/language/phpmailer.lang-br.php
 %lang(ro) %{_appdir}/language/phpmailer.lang-ro.php
 %lang(ru) %{_appdir}/language/phpmailer.lang-ru.php
 %lang(sv) %{_appdir}/language/phpmailer.lang-se.php
 %lang(tr) %{_appdir}/language/phpmailer.lang-tr.php
 
 %{_examplesdir}/%{name}-%{version}
-
-%files phpdoc
-%defattr(644,root,root,755)
-%{_phpdocdir}/phpmailer