packages: phorum/phorum.spec - use system phpmailer

[glen]

Author: glen                         Date: Tue Jan 12 17:26:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system phpmailer

---- Files affected:
packages/phorum:
   phorum.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.30 packages/phorum/phorum.spec:1.31
--- packages/phorum/phorum.spec:1.30	Mon Jan 11 15:40:21 2010
+++ packages/phorum/phorum.spec	Tue Jan 12 18:26:50 2010
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Phorum - implementacja forum WWW w PHP
 Name:		phorum
 Version:	%{themever}.14
-Release:	0.7
+Release:	0.20
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 Patch0:		paths.patch
 Patch1:		mysql.patch
 Patch2:		docsurl.patch
+Patch3:		sys-phpmailer.patch
 URL:		http://www.phorum.org/
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	webapps
@@ -86,7 +87,10 @@
 
 %prep
 %setup -q
-find '(' -name '*.php' -o -name '*.css' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+find '(' -name '*.php' -o -name '*.css' -o -name '*.js' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+
+# php-phpmailer
+rm -rf mods/smtp_mail/phpmailer
 
 # htaccess will be provided by apache.conf
 find -name .htaccess | xargs rm -v
@@ -121,6 +125,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -243,6 +248,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2010/01/12 17:26:50  glen
+- use system phpmailer
+
 Revision 1.30  2010/01/11 14:40:21  glen
 - template subpackages
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.30&r2=1.31&f=u